Главная Обзор Помощь
Регистрация Вход
xmy_android
/
small_sheep_android
Следить 3
В избранное 0
Ответвить 0
Файлы Обсуждения 0 Запросы на слияние 0 Вики
Просмотр исходного кода

Merge remote-tracking branch 'origin/sheep_develop' into sheep_tinker

zengjiebin лет назад: 7
Родитель
333d5a124d 3d90d8d4b0
Сommit
a4cbb3d0a3
15 измененных файлов с 124 добавлено и 78 удалено
Разделённый вид Показать статистику Diff
  1. 1 0
      app/src/main/java/com/kfzs/duanduan/event/EventTypes.java
  2. 12 3
      app/src/main/java/com/kfzs/duanduan/fragment/FgtAskgetmoney.java
  3. 1 1
      app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java
  4. 1 1
      app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java
  5. 29 14
      app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
  6. 2 2
      app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
  7. 2 2
      app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java
  8. 9 9
      app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java
  9. 7 0
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
  10. 5 4
      app/src/main/java/com/sheep/gamegroup/view/adapter/NewbieTaskAdp.java
  11. 5 9
      app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java
  12. 19 5
      app/src/main/java/com/sheep/gamegroup/view/dialog/DialogNewbieTaskRegistSuccess.java
  13. 29 25
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java
  14. 2 2
      app/src/main/res/layout/pop_get_redpackage.xml
  15. 0 1
      app/src/main/res/layout/xpersion_info_act_layout.xml

+ 1 - 0
app/src/main/java/com/kfzs/duanduan/event/EventTypes.java
Просмотреть файл 

@@ -42,4 +42,5 @@ public enum EventTypes {
 
 
     REFRESH_XIAOMI_GAME_LIST,//刷新界面
 
     FGT_SHEEP_REFRESH_H , //刷新fgtSmallSheep高度
 
+    FGT_SHEEP_SHOW_NEW_USER_HONG_BAO , //显示红包
 
 }

+ 12 - 3
app/src/main/java/com/kfzs/duanduan/fragment/FgtAskgetmoney.java
Просмотреть файл 

@@ -8,6 +8,8 @@ import android.support.v4.widget.NestedScrollView;
 
 import android.text.TextUtils;
 
 import android.view.MotionEvent;
 
 import android.view.View;
 
+
 
+import com.kfzs.duanduan.ActMain;
 
 import com.tencent.smtt.sdk.WebView;
 
 import android.widget.LinearLayout;
 
 import android.widget.TextView;
 
@@ -79,11 +81,18 @@ public class FgtAskgetmoney extends BaseCompatFragment {
 
     protected void initView(Bundle savedInstanceState) {
 
         setContentView(R.layout.x_ask_getmoney_act_layout);
 
         activity = getActivity();
 
+        if(activity instanceof ActMain){
 
+            TitleBarUtils.getInstance()
 
+                    .setTitle(mContentView, "邀请赚钱")
 
+                    .setTitleListen(mContentView,0,null);
 
+        }else {
 
+            TitleBarUtils.getInstance()
 
+                    .setTitle(mContentView, "邀请赚钱")
 
+                    .setTitleFinish(mContentView, activity);
 
+        }
 
         unbinder = ButterKnife.bind(this, mContentView);
 
 
-        TitleBarUtils.getInstance()
 
-                .setTitle(mContentView, "邀请赚钱")
 
-                .setTitleListen(mContentView,0,null);
 
+
 
         String content = "<!DOCTYPEhtml>\n" +
 
                 "<html>\n" +
 
                 "  <head>\n" +

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java
Просмотреть файл 

@@ -98,7 +98,7 @@ public class FgtFriendExtractPage extends BaseFragment {
 
                     public void onNext(BaseMessage baseMessage) {
 
                         List<Friend> friendList = baseMessage.getDatas(Friend.class);
 
                         if(friendList == null) {
 
-                            baseMessage.setMsg("您还没有邀请到好友");
 
+//                            baseMessage.setMsg("您还没有邀请到好友");
 
                             onError(baseMessage);
 
                         } else {
 
                             if (activity instanceof FgtAskGetMoneyFriend) {

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java
Просмотреть файл 

@@ -186,7 +186,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
 
         if (userEntity == null) {
 
             userEntity = DataUtil.getInstance().getUserEntity();
 
         }
 
-        if (!(userEntity.getParent_code().equals("") || (userEntity.getCreate_time_line() < 2) || (userEntity.getPackage_cate() == 1))) {
 
+        if (!userEntity.getParent_code().equals("") || (userEntity.getCreate_time_line() < 2) || (userEntity.getPackage_cate() == 1)) {
 
             ivRedpackage.setVisibility(View.GONE);
 
         } else {
 
             ivRedpackage.setVisibility(View.VISIBLE);

+ 29 - 14
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
Просмотреть файл 

@@ -234,13 +234,16 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                     break;
 
                 case 2:
 
                     FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(curPosition);
 
+                    if(mViewPager == null || item == null){
 
+                        return;
 
+                    }
 
                     int count = item.getDataCount();
 
                     ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
 
                     params.height = count == 0 ? G.HEIGHT / 3 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding_20));
 
                     mViewPager.setLayoutParams(params);
 
                     break;
 
                 case 7:
 
-                    isShowRedPackages((Context)msg.obj);
 
+                    isShowRedPackages(activity);
 
                     LogUtil.logI("handle message");
 
                     break;
 
             }
 
@@ -265,12 +268,16 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
      * @return 是否显示红包
 
      */
 
     public void isShowRedPackage() {
 
-        if (SpUtils.getFirst("first")) {
 
-            return;
 
-        }
 
         if (userEntity == null) {
 
             userEntity = DataUtil.getInstance().getUserEntity();
 
         }
 
+        if(userEntity == null){
 
+            return;
 
+        }
 
+        if (SpUtils.getFirst("first"+userEntity.getId())) {
 
+            return;
 
+        }
 
+        SpUtils.saveFirst("first"+userEntity.getId(), true);
 
         if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
 
             showRedPackage(getContext());
 
         }
 
@@ -294,7 +301,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         //每次进入主页都刷新一下url配置信息
 
         CommonUtil.getInstance().initUrlConfigByNet(null, null);
 
         isShowRedPackage();
 
-        SpUtils.saveFirst("first", true);
 
     }
 
 
 
@@ -974,6 +980,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
             case FGT_SHEEP_REFRESH_H:
 
                 mHanderl.sendEmptyMessage(2);
 
                 break;
 
+            case FGT_SHEEP_SHOW_NEW_USER_HONG_BAO:
 
+                mHanderl.sendEmptyMessage(7);
 
+                break;
 
         }
 
     }
 
 
@@ -1256,7 +1265,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
 
             @Override
 
             public void onClick(View v) {
 
-                CommonUtil.getInstance().updateUserInfo(null);
 
                 popupWindow.dismiss();
 
                 getRedPackage(popupWindow);
 
             }
 
@@ -1291,6 +1299,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                         if (popupWindow.isShowing()){
 
                             popupWindow.dismiss();
 
                         }
 
+                        CommonUtil.getInstance().updateUserInfo(null);
 
                     }
 
                 });
 
     }
 
@@ -1298,12 +1307,16 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
      * 新手任务
 
      */
 
     private void addNewTask(){
 
-        HomeListEntity homeListEntityNewTask = new HomeListEntity();
 
-        homeListEntityNewTask.setTitle("新手任务");
 
-        homeListEntityNewTask.setDesc("新手任务");
 
-        homeListEntityNewTask.setJump("-1");
 
-        homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw+"");
 
-        homeListEntitys.add(0, homeListEntityNewTask);
 
+
 
+        if(onResumeCount == 0 && CommonUtil.getInstance().addNewTask(activity,userEntity) && homeListEntitysGridview != null)//第一次才调用
 
+        {
 
+            HomeListEntity homeListEntityNewTask = new HomeListEntity();
 
+            homeListEntityNewTask.setTitle("新手任务");
 
+            homeListEntityNewTask.setDesc("新手任务");
 
+            homeListEntityNewTask.setJump("-1");
 
+            homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw + "");
 
+            homeListEntitys.add(0, homeListEntityNewTask);
 
+        }
 
         if(homeListEntitys.size() > 8){
 
             HomeListEntity homeListEntity = new HomeListEntity();
 
             homeListEntity.setTitle("查看更多");
 
@@ -1329,13 +1342,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);

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
Просмотреть файл 

@@ -418,7 +418,7 @@ public class CommonUtil {
 
     public void goNative(Context context, HomeListEntity entity, String from) {
 
 
         switch (Integer.valueOf(entity.getJump())) {
 
-            case -1://试玩赚钱
 
+            case -1://新手任务
 
 
                 DialogNewbieTaskList.tryShowDialog((Activity) context);
 
                 NEWBIE_TASK.onEvent();
 
@@ -1871,7 +1871,7 @@ public class CommonUtil {
 
                             public void onNext(BaseMessage baseMessage) {
 
                                 List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
 
                                 if (newbieTaskList != null && !newbieTaskList.isEmpty() && newbieTaskList.size() > 1 && !newbieTaskList.get(1).getFinished()) {//了解小绵羊任务未完成时
 
-                                    DialogNewbieTaskRegistSuccess.showDialog(activity, finalNewbie_task_record, newbieTaskList.get(0));
 
+//                                    DialogNewbieTaskRegistSuccess.showDialog(activity, finalNewbie_task_record, newbieTaskList.get(0));
 
                                 } else if (newbieTaskList != null && !newbieTaskList.isEmpty()) {
 
                                     finalNewbie_task_record.setDontShowNewbieTaskDialog(true);
 
                                     MyDbManager.getInstance().saveOrUpdate(finalNewbie_task_record);//设置为不再显示新手对话框

+ 2 - 2
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);

+ 9 - 9
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) {
 
@@ -169,18 +169,18 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
 
             return;
 
         }
 
         switch (view.getId()) {
 
-          /*  case R.id.llayout_sex://用户性别
 
-                ViewUtil.choiceSex(PersonalInfoAct.this, getCurrentFocus());
 
-                break;*/
 
-            case R.id.tv_sex://用户性别
 
+            case R.id.llayout_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:
 
+//            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.personal_info_avatar_container://头像
 
                 showChooseDialog();
 
                 USER_INFO_AVATAR.onEvent();

+ 7 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
Просмотреть файл 

@@ -345,6 +345,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
             case 1000://连续任务
 
                 if (taskEty.isAppAutoCommitTask()) {
 
                     setBottomState2();
 
+                    setBottomState();
 
                 } else {//非应用自动审核的连续任务
 
                     setSuccessionTaskBottomState();
 
                 }
 
@@ -509,6 +510,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
                 }
 
             }
 
         });
 
+        if(gettaskAcceptedEty == null){
 
+            btnTaskItem.setText("领取任务");
 
+        }
 
     }
 
 
     private void loadOld() {
 
@@ -637,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) {

+ 5 - 4
app/src/main/java/com/sheep/gamegroup/view/adapter/NewbieTaskAdp.java
Просмотреть файл 

@@ -10,6 +10,8 @@ import android.widget.BaseAdapter;
 
 import android.widget.ImageView;
 
 import android.widget.TextView;
 
 
+import com.kfzs.duanduan.event.BigEvent;
 
+import com.kfzs.duanduan.event.EventTypes;
 
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
 
 import com.sheep.gamegroup.model.entity.NewbieTask;
 
 import com.sheep.gamegroup.model.entity.UserEntity;
 
@@ -20,6 +22,8 @@ import com.sheep.jiuyan.samllsheep.BuildConfig;
 
 import com.sheep.jiuyan.samllsheep.R;
 
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 
+import org.greenrobot.eventbus.EventBus;
 
+
 
 import java.util.List;
 
 import java.util.Locale;
 
 
@@ -148,10 +152,7 @@ public class NewbieTaskAdp extends BaseAdapter {
 
     private static void isShow(Context context) {
 
         UserEntity userEntity = DataUtil.getInstance().getUserEntity();
 
         if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
 
-            Message message = Message.obtain();
 
-            message.obj = context;
 
-            message.what = 7;
 
-            new FgtSmallSheep().mHanderl.sendMessage(message);
 
+            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.FGT_SHEEP_SHOW_NEW_USER_HONG_BAO));
 
             LogUtil.logI("sendmessage");
 
         }
 
     }

+ 5 - 9
app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java
Просмотреть файл 

@@ -100,13 +100,6 @@ public class TaskListItemAdp extends BaseAdapter {
 
             holder.price_tv.setTextColor(context.getResources().getColor(R.color.time_created));
 
         }
 
         holder.price_tv.setText(stateStr);
 
-        if(!TextUtils.isEmpty(ety.getRemarks())){
 
-            holder.desc_tv.setVisibility(View.VISIBLE);
 
-
 
-        }else {
 
-            holder.desc_tv.setVisibility(View.GONE);
 
-        }
 
-        holder.desc_tv.setText(TextUtils.isEmpty(ety.getRemarks())?"":"失败原因:"+ety.getRemarks());
 
         convertView.setOnClickListener(new View.OnClickListener() {
 
             @Override
 
             public void onClick(View v) {
 
@@ -114,7 +107,7 @@ public class TaskListItemAdp extends BaseAdapter {
 
             }
 
         });
 
         TestUtil.setDebugDownLoad(context, convertView, ety.getRelease_task().getTask());
 
-        returnValue3(ety, holder.detail_task_tv);
 
+        returnValue3(ety, holder.detail_task_tv,holder.desc_tv);
 
         Glide.with(context)
 
                 .load(ety.getRelease_task().getTask().getIcon())
 
                 .apply(new RequestOptions().placeholder(R.mipmap.icon))
 
@@ -161,7 +154,8 @@ public class TaskListItemAdp extends BaseAdapter {
 
         }
 
         return stateStr;
 
     }
 
-    private String returnValue3(TaskAcceptedEty ety, TextView textView){
 
+    private String returnValue3(TaskAcceptedEty ety, TextView textView, TextView desc_tv){
 
+        desc_tv.setVisibility(View.GONE);
 
         String stateStr = "已接受任务";
 
         switch (ety.getStatus()){
 
             default:
 
@@ -189,6 +183,8 @@ public class TaskListItemAdp extends BaseAdapter {
 
                 textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
 
                 textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
 
                 textView.setText("重新提交");
 
+                desc_tv.setVisibility(View.VISIBLE);
 
+                desc_tv.setText(TextUtils.isEmpty(ety.getRemarks())?"":"失败原因:"+ety.getRemarks());
 
                 break;
 
         }
 
         return stateStr;

+ 19 - 5
app/src/main/java/com/sheep/gamegroup/view/dialog/DialogNewbieTaskRegistSuccess.java
Просмотреть файл 

@@ -42,17 +42,31 @@ public class DialogNewbieTaskRegistSuccess {
 
         mAlertDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
 
             @Override
 
             public void onCancel(DialogInterface dialogInterface) {
 
-                newbie_task_record.setDontShowNewbieTaskDialog(true);
 
-                MyDbManager.getInstance().saveOrUpdate(newbie_task_record);//设置为不再显示新手对话框
 
+
 
+                try {
 
+                    if(newbie_task_record == null)
 
+                        return;
 
+                    newbie_task_record.setDontShowNewbieTaskDialog(true);
 
+                    MyDbManager.getInstance().saveOrUpdate(newbie_task_record);//设置为不再显示新手对话框
 
+                } catch (Exception e) {
 
+                    e.printStackTrace();
 
+                }
 
             }
 
         });
 
         final View dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
 
         dialog_close.setOnClickListener(new View.OnClickListener() {
 
             @Override
 
             public void onClick(View v) {
 
-                mAlertDialog.dismiss();
 
-                newbie_task_record.setDontShowNewbieTaskDialog(true);
 
-                MyDbManager.getInstance().saveOrUpdate(newbie_task_record);//设置为不再显示新手对话框
 
+
 
+                try {
 
+                    if(newbie_task_record == null)
 
+                        return;
 
+                    mAlertDialog.dismiss();
 
+                    newbie_task_record.setDontShowNewbieTaskDialog(true);
 
+                    MyDbManager.getInstance().saveOrUpdate(newbie_task_record);//设置为不再显示新手对话框
 
+                } catch (Exception e) {
 
+                    e.printStackTrace();
 
+                }
 
             }
 
         });
 
         try {

+ 29 - 25
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();
 
         }
 
     }
 
     /**

+ 2 - 2
app/src/main/res/layout/pop_get_redpackage.xml
Просмотреть файл 

@@ -6,7 +6,7 @@
 
     <LinearLayout
 
         android:id="@+id/l_layout"
 
         android:layout_width="match_parent"
 
-        android:layout_height="150dp"
 
+        android:layout_height="180dp"
 
         android:layout_marginStart="25dp"
 
         android:layout_marginEnd="25dp"
 
         android:layout_centerInParent="true"
 
@@ -40,7 +40,7 @@
 
             android:layout_width="wrap_content"
 
             android:layout_height="wrap_content"
 
             android:layout_gravity="center_horizontal"
 
-            android:layout_marginTop="15dp"
 
+            android:layout_marginTop="35dp"
 
             android:background="@drawable/shape_get_redpackage_text_yellow"
 
             android:gravity="center"
 
             android:text="领取红包"

+ 0 - 1
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>