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

陶汉栋
2 parents 0225fa8f 9097b24e
Showing 4 changed files with 59 additions and 52 deletions Show diff stats
.idea/modules.xml
app/libs/processor.jar
app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
@@ -4,7 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/mvpsdk/mvpsdk.iml" filepath="$PROJECT_DIR$/mvpsdk/mvpsdk.iml" />
-      <module fileurl="file://F:/parentwork/parentWorkHolper.iml" filepath="F:/parentwork/parentWorkHolper.iml" />
       <module fileurl="file://$PROJECT_DIR$/parentWorkHolper.iml" filepath="$PROJECT_DIR$/parentWorkHolper.iml" />
       <module fileurl="file://$PROJECT_DIR$/parentwork.iml" filepath="$PROJECT_DIR$/parentwork.iml" />
       <module fileurl="file://F:/parentWorkHolper/parentwork.iml" filepath="F:/parentWorkHolper/parentwork.iml" />
@@ -11,16 +11,11 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
-import android.text.Spannable;
-import android.text.SpannableString;
 import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.PopupMenu;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 import com.google.gson.Gson;
@@ -77,7 +72,7 @@ public class ReportFragment extends BaseMVPCompatFragment&lt;MyChildContract.MyChil
         viewPager.setAdapter(myFragmentAdapter);
         tabLayout.setupWithViewPager(viewPager);
         tabLayout.removeAllTabs();
-        tabLayout.addTab(tabLayout.newTab().setText("成长"));
+        tabLayout.addTab(tabLayout.newTab().setText("应用"));
         tabLayout.addTab(tabLayout.newTab().setText("报告"));
         viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
@@ -97,13 +92,14 @@ public class ReportFragment extends BaseMVPCompatFragment&lt;MyChildContract.MyChil
             }
         });
         //在viewpager初始化之后加载
-        mPresenter.loadChildList(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME), 0, "");
+//        mPresenter.loadChildList(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME), 0, "");
     }
     @Override
     public void onResume() {
         super.onResume();
+        mPresenter.loadChildList(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME), 0, "");
     }
     @Override
@@ -111,15 +107,16 @@ public class ReportFragment extends BaseMVPCompatFragment&lt;MyChildContract.MyChil
         switch (view.getId()) {
             case R.id.tvShaiXuan:
                 if (null == shaiXuanPop) shaiXuanPop = new ShaiXuanPop(getActivity());
-                if (null!=chengZhangFragment2)chengZhangFragment2.showShaixuan(handler);
+                if (null != chengZhangFragment2) chengZhangFragment2.showShaixuan(handler);
                 break;
             case R.id.tvName:
-                showChildName();
+                if(childlist!=null&&childlist.size()>0)
+                    showChildName();
                 break;
         }
     }
-    public void refreshChild(){
+    public void refreshChild() {
         mPresenter.loadChildList(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME), 0, "");
     }
@@ -179,28 +176,33 @@ public class ReportFragment extends BaseMVPCompatFragment&lt;MyChildContract.MyChil
             List<ChildBean> list = currentBean.getStudentClass();
             String currChildStr = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.CURRCHILDJSONSTR);
             childlist.addAll(list);
-
             if (childlist == null || childlist.size() == 0) {
-                if(null!=chengZhangFragment1)chengZhangFragment1.showNoData();
-                if(null!=chengZhangFragment2)chengZhangFragment2.showNoData();
-            }
-            if (TextUtils.isEmpty(currChildStr)) {
-                if (childlist != null && childlist.size() > 0) {
-                    tvName.setText(childlist.get(0).getStudentName());
-                    jsonStr = g.toJson(childlist.get(0), ChildBean.class);
-                }
+                if (null != chengZhangFragment1) chengZhangFragment1.showNoData();
+                if (null != chengZhangFragment2) chengZhangFragment2.showNoData();
+                tvName.setText("未绑定");
+                AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, "");
             } else {
-                ChildBean childBean = g.fromJson(currChildStr, ChildBean.class);
-                for (int i = 0; i < childlist.size(); i++) {
-                    if (childBean.getStudentId() == childlist.get(i).getStudentId()) {
-                        jsonStr = g.toJson(childlist.get(i), ChildBean.class);
-                        break;
+                if (TextUtils.isEmpty(currChildStr)) {
+                    if (childlist != null && childlist.size() > 0) {
+                        tvName.setText(childlist.get(0).getStudentName());
+                        jsonStr = g.toJson(childlist.get(0), ChildBean.class);
+                    }
+                } else {
+                    ChildBean childBean = g.fromJson(currChildStr, ChildBean.class);
+                    for (int i = 0; i < childlist.size(); i++) {
+                        if (childBean.getStudentId() == childlist.get(i).getStudentId()) {
+                            jsonStr = g.toJson(childlist.get(i), ChildBean.class);
+                            break;
+                        }
                     }
+
+                    tvName.setText(childBean.getStudentName());
                 }
-                tvName.setText(childBean.getStudentName());
+
+                if (null != chengZhangFragment1) chengZhangFragment1.setChildJson(jsonStr);
+
+                AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr);
             }
-            if (null != chengZhangFragment1) chengZhangFragment1.setChildJson(jsonStr);
-            AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr);
             createSchoolMenu();
         }
@@ -219,8 +221,8 @@ public class ReportFragment extends BaseMVPCompatFragment&lt;MyChildContract.MyChil
     @Override
     public void showError(String error) {
         if (error.equals("访问的接口要求登录")) {
-            if(null!=chengZhangFragment1)chengZhangFragment1.showNoData();
-            if(null!=chengZhangFragment2)chengZhangFragment2.showNoData();
+            if (null != chengZhangFragment1) chengZhangFragment1.showNoData();
+            if (null != chengZhangFragment2) chengZhangFragment2.showNoData();
         }
     }
@@ -232,9 +234,9 @@ public class ReportFragment extends BaseMVPCompatFragment&lt;MyChildContract.MyChil
         @Override
         public CharSequence getPageTitle(int position) {
-            if (position==0){
+            if (position == 0) {
                 return "应用";
-            }else {
+            } else {
                 return "报告";
             }
         }
@@ -22,8 +22,6 @@ import android.widget.TextView;
 import com.amy.monthweek.materialcalendarview.MonthWeekMaterialCalendarView;
 import com.google.gson.Gson;
-import com.netease.nimlib.sdk.NIMClient;
-import com.netease.nimlib.sdk.mixpush.NIMPushClient;
 import com.prolificinteractive.materialcalendarview.CalendarDay;
 import com.prolificinteractive.materialcalendarview.MaterialCalendarView;
 import com.share.mvpsdk.base.BasePresenter;
@@ -100,7 +98,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep
         layout_kaoqin = view.findViewById(R.id.layout_kaoqin);
         layout_buka = view.findViewById(R.id.layout_buka);
         layout_qingjia = view.findViewById(R.id.layout_qingjia);
-        tvNoData=view.findViewById(R.id.tvNoData);
+        tvNoData = view.findViewById(R.id.tvNoData);
         calendarView_month_mode = view.findViewById(R.id.calendarView_month_mode);
         monthWeekMaterialCalendarView = view.findViewById(R.id.slidelayout);
         layout_chengzhang = view.findViewById(R.id.layout_chengzhang);
@@ -112,11 +110,12 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep
         show();
     }
-    private void show() {
+    public void show() {
         Gson g = new Gson();
         if (type.equals(TYPE_CHENGZHANG)) {
             layout_chengzhang.setVisibility(View.VISIBLE);
             layout_report.setVisibility(View.GONE);
+            rl_noData.setVisibility(View.GONE);
             childBean = g.fromJson(jsonStr, ChildBean.class);
         } else {
@@ -184,16 +183,16 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep
     @Override
     public void onClick(View view) {
-
+        if(showOrderPopu())
+            return;
         switch (view.getId()) {
             case R.id.layout_kaoqin:
-//                ApplySigninActivity.getInstance(getActivity(), jsonStr);
-                showOrderPopu();
+                ApplySigninActivity.getInstance(getActivity(), jsonStr);
+
                 break;
             case R.id.layout_buka:
-//                ApplyReplaceCardActivity.getInstance(getActivity(), jsonStr);
-                showOrderPopu();
+                ApplyReplaceCardActivity.getInstance(getActivity(), jsonStr);
                 break;
             case R.id.layout_qingjia:
                 ToastUtils.showToast("正在努力开发中，敬请期待");
@@ -201,17 +200,17 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep
         }
     }
-    private void showOrderPopu(){
-        if (null==childBean||childBean.getCount() == 0) {
+    private boolean showOrderPopu() {
+        if (null == childBean || childBean.getCount() == 0) {
             final PopupWindow popupWindow = new PopupWindow();
             popupWindow.setWidth(ViewGroup.LayoutParams.MATCH_PARENT);
             popupWindow.setHeight(ViewGroup.LayoutParams.MATCH_PARENT);
             backgroundAlpha(0.5f);
             View view1 = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view, null);
             TextView dialog_info = view1.findViewById(R.id.dialog_info);
-            String text="请前往订购中心\n订购“智能校卫”\n才能够使用相关应用功能";
+            String text = "请前往订购中心\n订购“智能校卫”\n才能够使用相关应用功能";
             Spannable span = new SpannableString(text);
-            span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)),3,7,Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)), 3, 7, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             dialog_info.setText(span);
             dialog_info.setGravity(Gravity.CENTER);
             TextView right_btn = view1.findViewById(R.id.right_btn);
@@ -240,15 +239,17 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep
             popupWindow.setContentView(view1);
             popupWindow.showAtLocation(recyclerView, Gravity.CENTER, 0, 0);
-            return;
+            return true;
         }
         if (TextUtils.isEmpty(childBean.getCardNumber())) {
             BankActivity.newInstance(getActivity(), "如果使用该应用，请前往激活孩子校园卡");
-            return;
+            return true;
         }
+        return false;
     }
+
     @NonNull
     @Override
     public BasePresenter initPresenter() {
@@ -277,18 +278,23 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep
      * 显示没有数据
      */
     public void showNoData() {
-        if (type.equals(TYPE_REPORT)){
+        layout_chengzhang.setVisibility(View.GONE);
+        layout_report.setVisibility(View.GONE);
+        rl_noData.setVisibility(View.VISIBLE);
+        if (type.equals(TYPE_REPORT)) {
             tvNoData.setBackgroundDrawable(getResources().getDrawable(R.drawable.baogao_back));
+            rl_noData.setGravity(Gravity.CENTER);
+            tvNoData.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
             tvNoData.setText("");
-        }else
-        setTextColor();
+        } else
+            setTextColor();
     }
     private void setTextColor() {
-        String text="如需使用该模块，请先前往\n个人中心—我的孩子\n绑定孩子账号";
+        String text = "如需使用该模块，请先前往\n个人中心—我的孩子\n绑定孩子账号";
         Spannable span = new SpannableString(text);
-        span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)),13,22,Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)), 13, 22, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         tvNoData.setText(span);
     }