Sfoglia il codice sorgente

修复bugly上面出现的5个bug;
修复低版本无法加载主页,导致无法进入应用的bug;

zengjiebin 7 anni fa
parent
commit
7ee26bac89

+ 10 - 4
app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -211,7 +211,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        showRedPackageAfterInvitation(getActivity(), getView(), baseMessage);
+                        showRedPackageAfterInvitation(activity, getView(), baseMessage);
                         if (popupWindow.isShowing()) {
                             popupWindow.dismiss();
                         }
@@ -227,6 +227,9 @@ public class FgtPersonalCenter extends BaseCompatFragment {
      * @param mActivity 当前Activity
      */
     public void showRedPackageAfterInvitation(final Activity mActivity, View viewAnchor, BaseMessage baseMessage) {
+        if(viewAnchor == null){
+            return;
+        }
         View view = LayoutInflater.from(mActivity).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
         TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
         TextView tvMoney = view.findViewById(R.id.tv_money);
@@ -241,10 +244,13 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         popupWindow.setOutsideTouchable(false);
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         backgroundAlpha(0.7f, mActivity);
-        popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        try {
+            popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         popupWindow.setOnDismissListener(new ViewUtil.PopDismissListener(mActivity));
-        RedPackageMoney redPackageMoney = baseMessage.getData(RedPackageMoney.class);
-        tvMoney.setText("" + 1);
+        tvMoney.setText("1");
         tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

+ 11 - 37
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -223,7 +223,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 case 1:
                     tryMakeMoneyAdp.clear();
                     if(!ListUtil.isEmpty(allTaskAcceptedTaskList)){
-                        recyclerview_line.setVisibility(View.VISIBLE);
+                        if(recyclerview_line != null)
+                            recyclerview_line.setVisibility(View.VISIBLE);
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList));
                     }
                     if(!ListUtil.isEmpty(releaseEtyLists)) {
@@ -369,8 +370,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     }
 
-
-    @RequiresApi(api = Build.VERSION_CODES.M)
     @SuppressLint("ClickableViewAccessibility")
     public void initListener() {
         scrollView.setOnTouchListener(new View.OnTouchListener() {
@@ -403,31 +402,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             }
         });
 
-        scrollView.setOnScrollChangeListener(new View.OnScrollChangeListener() {
-            @Override
-            public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
-
-//                try {
-//                    tabLayout.post(new Runnable() {
-//                        @Override
-//                        public void run() {
-//                            int count = mViewPager.getChildCount();
-//                            if(count > 0){
-//                                toolBarPositionY = tabLayout.getHeight();
-////                                ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-//                                ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-//                                params.height = G.getRealPix(count * 50);
-//                                mViewPager.setLayoutParams(params);
-//                                LogUtil.logE("--------"+count+";height:"+mViewPager.getHeight()+","+mViewPager.getMeasuredHeight());
-//                            }
-//
-//                        }
-//                    });
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-            }
-        });
 
         refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
@@ -652,7 +626,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
 
-    @OnClick({R.id.recharge, R.id.withdrawal,
+    @OnClick({R.id.recharge, R.id.withdrawal, R.id.view_rob_duty,
             R.id.newbie_task, R.id.icon_img_iv, R.id.user_layout
     })
     public void onViewClicked(View view) {
@@ -676,6 +650,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             case R.id.recharge://充值
                 Jump2View.getInstance().goRechargeAct(activity, "首页");
                 break;
+            case R.id.view_rob_duty://抢任务弹框
+                ViewUtil.showRobDutyDialog(getActivity(), getView());
+                break;
         }
     }
 
@@ -918,13 +895,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         if(DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
             refreshTaskList();
-
-        viewRobDuty.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ViewUtil.showRobDutyDialog(getActivity(), getView());
-            }
-        });
     }
 
 
@@ -1258,7 +1228,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         popupWindow.setOutsideTouchable(false);
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         backgroundAlpha(0.7f, mActivity);
-        popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        try {
+            popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         popupWindow.setOnDismissListener(new ViewUtil.PopDismissListener(mActivity));
         tvMoney.setText("1.8");
         tvNew.setText("新人红包");

+ 8 - 8
app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -505,7 +505,7 @@ public class TaskEty implements Serializable, IDownload {
     public @interface STATUS {
     }
     /**
-     * 根据状态获取当前第一个可提交子任务的already_accepted_task_id
+     * 根据状态获取当前第一个子任务
      *
      1、 任务未开启时——即将开启
      2、 任务未领取时——可领取
@@ -516,15 +516,15 @@ public class TaskEty implements Serializable, IDownload {
      7、任务已过期未完成——已过期
      * @return
      */
-    public int getCanCommitChildRelease_task_id(@STATUS int status) {
+    public TaskChild getCanCommitChild(@STATUS int status) {
         if(!ListUtil.isEmpty(child)){
             for (TaskChild taskChild : child) {
                 if(status == taskChild.getStatus()){
-                    return taskChild.getAlready_accepted_task_id();
+                    return taskChild;
                 }
             }
         }
-        return -1;
+        return null;
     }
     /**
      * 获取当前第一个可提交子任务的already_accepted_task_id
@@ -540,12 +540,12 @@ public class TaskEty implements Serializable, IDownload {
      */
     public int getCanCommitChildRelease_task_id() {
         //先找审核失败的子任务
-        int commitScreenShotTaskId = getCanCommitChildRelease_task_id(TaskEty.STATUS_FAIL);
+        TaskChild commitScreenShotTask = getCanCommitChild(TaskEty.STATUS_FAIL);
+        if(commitScreenShotTask == null){
         //再找进行中的子任务
-        if(commitScreenShotTaskId < 1){
-            commitScreenShotTaskId = getCanCommitChildRelease_task_id(TaskEty.STATUS_RUNNING);
+            commitScreenShotTask = getCanCommitChild(TaskEty.STATUS_RUNNING);
         }
-        return commitScreenShotTaskId;
+        return commitScreenShotTask == null ? -1 : commitScreenShotTask.getAlready_accepted_task_id();
     }
 
     /**

+ 15 - 3
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -260,7 +260,11 @@ public class ViewUtil {
         popupWindow.setOutsideTouchable(false);
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         backgroundAlpha(0.5f, mActivity);
-        popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        try {
+            popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         popupWindow.setOnDismissListener(new PopDismissListener(mActivity));
         //更换任务
         ivChangeOne.setOnClickListener(new View.OnClickListener() {
@@ -318,7 +322,11 @@ public class ViewUtil {
         popupWindow.setOutsideTouchable(false);
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         backgroundAlpha(0.7f, mActivity);
-        popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        try {
+            popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         popupWindow.setOnDismissListener(new PopDismissListener(mActivity));
         tvTitle.setText("兑换");
         tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
@@ -390,7 +398,11 @@ public class ViewUtil {
         popupWindow.setFocusable(true);
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         backgroundAlpha(0.5f, mActivity);
-        popupWindow.showAtLocation(viewAnchor, Gravity.BOTTOM, 0, 0);
+        try {
+            popupWindow.showAtLocation(viewAnchor, Gravity.BOTTOM, 0, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         popupWindow.setOnDismissListener(new PopDismissListener(mActivity));
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override

+ 3 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -857,8 +857,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     private void addCanCommitTaskChildId(JSONObject object, TaskEty taskEty) {
         switch (taskEty.getTask_type()) {
             case 1000://连续任务
-                int task_child_id = taskEty.getCanCommitChildRelease_task_id(TaskEty.STATUS_RUNNING);
-                object.put("task_child_id", task_child_id);
+                TaskChild task_child = taskEty.getCanCommitChild(TaskEty.STATUS_RUNNING);
+                if(task_child != null)
+                    object.put("task_child_id", task_child.getId());
                 break;
         }
     }

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -213,7 +213,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         DataUtil.getInstance().isTaskListChange(getClass());
         isFirstCache = false;
         if(TextUtils.isEmpty(show_type))
-            refresh.setRefreshing(true);
+            if(refresh != null)
+                refresh.setRefreshing(true);
         mInitData();
     }
     public void mInitData() {