3.0.0 bug 修改

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -1336,13 +1336,15 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         if(homeListEntitysGridview.size() > 8){
             HomeListEntity homeListEntity = new HomeListEntity();
-            homeListEntity.setTitle("查看更多");
-            homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
             homeListEntity.setSelect(flag);
             if (flag) {
+                homeListEntity.setTitle("收起模块");
+                homeListEntity.setDesc("收起模块");
                 homeListEntity.setIcon(R.mipmap.homepage_chakangd_click+"");
             } else {
+                homeListEntity.setTitle("查看更多");
+                homeListEntity.setDesc("查看更多");
                 homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
             }
             homeListEntitysGridview.set(7, homeListEntity);

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -281,8 +281,8 @@ public class ViewUtil {
                     return;
                 }
                 Intent intent = new Intent(mActivity, TaskDetailAct.class);
-                intent.putExtra("btn_show", true);
-                intent.putExtra("is_from_task_list", true);
+                intent.putExtra("btn_show", false);
+                intent.putExtra("is_from_task_list", false);
                 intent.putExtra("task_id", mRobTask.getM().getId());
                 mActivity.startActivity(intent);
 

app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java

@@ -161,7 +161,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
     }
 
     @OnClick({R.id.personal_info_avatar_container, R.id.personal_info_name_container, R.id.personal_info_qr_container, R.id.personal_info_phone_container, R.id.personal_info_wx_container,
-            R.id.personal_info_authentication_container, R.id.llayout_sex, R.id.tv_sex, R.id.llayout_birthday,R.id.tv_birthday})
+            R.id.personal_info_authentication_container, R.id.llayout_sex, R.id.llayout_birthday})
 
     public void onClick(View view) {
         if (userEntity == null) {
@@ -172,15 +172,15 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
             case R.id.llayout_sex://用户性别
                 ViewUtil.choiceSex(PersonalInfoAct.this, getCurrentFocus());
                 break;
-            case R.id.tv_sex://用户性别
-                ViewUtil.choiceSex(PersonalInfoAct.this, getCurrentFocus());
-                break;
+//            case R.id.tv_sex://用户性别
+//                ViewUtil.choiceSex(PersonalInfoAct.this, getCurrentFocus());
+//                break;
             case R.id.llayout_birthday://用户生日
                 ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday,TextUtils.isEmpty(userEntity.getBirthday())?"1990-01-01":userEntity.getBirthday());
                 break;
-            case R.id.tv_birthday:
-                ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday,TextUtils.isEmpty(userEntity.getBirthday())?"1990-01-01":userEntity.getBirthday());
-                break;
+//            case R.id.tv_birthday:
+//                ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday,TextUtils.isEmpty(userEntity.getBirthday())?"1990-01-01":userEntity.getBirthday());
+//                break;
             case R.id.personal_info_avatar_container://头像
                 showChooseDialog();
                 USER_INFO_AVATAR.onEvent();

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -641,6 +641,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 case R.id.ll_infos:
                     break;
                 case R.id.btn_task_item:
+                    if(type != 10 && gettaskAcceptedEty == null){
+                        type = -1;
+                    }
                     switch (type) {
                         case -1:
                             if (taskReleaseEty.getAccepted_task_id() > 0) {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -429,31 +429,35 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         }
     }
     private void getFromACache(int type){
-        if(type > 1){
-            return;
-        }
-        List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task(type, task_type, TextUtils.isEmpty(show_type)?is_succession:3), TaskReleaseEty.class);
-        switch (type){
-            case 0:
-                if(cacheTaskReleaseEtyList == null) {
-                    releaseEtyLists.clear();
-                } else {
-                    releaseEtyLists.clear();
-                    releaseEtyLists.addAll(cacheTaskReleaseEtyList);
-                    notifyDataSetChanged();
-                    getFromAcacheFirst(type);
-                }
-                break;
-            case 1:
-                if(cacheTaskReleaseEtyList == null) {
-                    releaseEtyListsBegin.clear();
-                } else {
-                    releaseEtyListsBegin.clear();
-                    releaseEtyListsBegin.addAll(cacheTaskReleaseEtyList);
-                    notifyDataSetChanged();
-                    getFromAcacheFirst(type);
-                }
-                break;
+        try {
+            if(type > 1){
+                return;
+            }
+            List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task(type, task_type, TextUtils.isEmpty(show_type)?is_succession:3), TaskReleaseEty.class);
+            switch (type){
+                case 0:
+                    if(cacheTaskReleaseEtyList == null) {
+                        releaseEtyLists.clear();
+                    } else {
+                        releaseEtyLists.clear();
+                        releaseEtyLists.addAll(cacheTaskReleaseEtyList);
+                        notifyDataSetChanged();
+                        getFromAcacheFirst(type);
+                    }
+                    break;
+                case 1:
+                    if(cacheTaskReleaseEtyList == null) {
+                        releaseEtyListsBegin.clear();
+                    } else {
+                        releaseEtyListsBegin.clear();
+                        releaseEtyListsBegin.addAll(cacheTaskReleaseEtyList);
+                        notifyDataSetChanged();
+                        getFromAcacheFirst(type);
+                    }
+                    break;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
     /**

app/src/main/res/layout/xpersion_info_act_layout.xml

@@ -83,7 +83,6 @@
             <TextView
                 android:id="@+id/tv_sex"
                 style="@style/style_item_end_next"
-                android:textIsSelectable="true"
                 android:layout_width="150dp"/>
 
         </LinearLayout>