陶汉栋 / ParentWork

Download as
Browse Code »

Commit ddfe0ee95656397a9e285d2267972a49258fc248

Authored by 陶汉栋
2 parents 5f32350a b0206fd7
Exists in yxb_dev and in 1 other branch developer

Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer

Showing 2 changed files with 7 additions and 4 deletions   Show diff stats
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
  Diff comments   View file @ddfe0ee
@@ -104,7 +104,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract @@ -104,7 +104,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
104 String useName = AppConfig.getAppConfig(getContext()).get(AppConfig.USER_NAME); 104 String useName = AppConfig.getAppConfig(getContext()).get(AppConfig.USER_NAME);
105 if (!TextUtils.isEmpty(useName)) AppConfig.ISLOGIN = true; 105 if (!TextUtils.isEmpty(useName)) AppConfig.ISLOGIN = true;
106 else AppConfig.ISLOGIN = false; 106 else AppConfig.ISLOGIN = false;
107 - if (AppConfig.getAppConfig(getContext()).get(AppConfig.ISBINDING).equals("1")) { 107 + if ("1".equals(AppConfig.getAppConfig(getContext()).get(AppConfig.ISBINDING))) {
108 binding_state.setText(""); 108 binding_state.setText("");
109 } else { 109 } else {
110 binding_state.setText("未绑定"); 110 binding_state.setText("未绑定");
@@ -224,6 +224,8 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract @@ -224,6 +224,8 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
224 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, ""); 224 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, "");
225 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, ""); 225 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, "");
226 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, ""); 226 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, "");
  227 + AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, "");
  228 + AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.ISBINDING, "0");
227 AppConfig.ISLOGIN = false; 229 AppConfig.ISLOGIN = false;
228 setPersonInfo(); 230 setPersonInfo();
229 MessageManager.getInstance().logout(); 231 MessageManager.getInstance().logout();
app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
  Diff comments   View file @ddfe0ee
@@ -110,7 +110,7 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil @@ -110,7 +110,7 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
110 if (null != chengZhangFragment2) chengZhangFragment2.showShaixuan(handler); 110 if (null != chengZhangFragment2) chengZhangFragment2.showShaixuan(handler);
111 break; 111 break;
112 case R.id.tvName: 112 case R.id.tvName:
113 - if(childlist!=null&&childlist.size()>0) 113 + if (childlist != null && childlist.size() > 0)
114 showChildName(); 114 showChildName();
115 break; 115 break;
116 } 116 }
@@ -127,9 +127,10 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil @@ -127,9 +127,10 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
127 private PopupMenu childMenu = null; 127 private PopupMenu childMenu = null;
128 128
129 private void createSchoolMenu() { 129 private void createSchoolMenu() {
130 - if (childMenu != null) return;  
131 - childMenu = new PopupMenu(getActivity(), tvName); 130 + if (childMenu == null)
  131 + childMenu = new PopupMenu(getActivity(), tvName);
132 Menu menu = childMenu.getMenu(); 132 Menu menu = childMenu.getMenu();
  133 + menu.clear();
133 if (childlist != null && childlist.size() > 0) { 134 if (childlist != null && childlist.size() > 0) {
134 for (int i = 0; i < childlist.size(); i++) { 135 for (int i = 0; i < childlist.size(); i++) {
135 final int finalI = i; 136 final int finalI = i;