Просмотр исходного кода

修复小米游戏中心等界面中显示出多余的TextView

zengjiebin лет назад: 7
Родитель
Сommit
1d86fcbfb0

+ 4 - 8
app/src/main/java/com/sheep/gamegroup/module/pay/activity/SheepWXPayEntryActivity.java

@@ -7,41 +7,37 @@ import android.os.Bundle;
 import com.sheep.gamegroup.util.ApiJSONUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
-import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
-import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
 /**
  * Created by realicing on 2019/1/29.
  * realicing@sina.com
- *
+ * <p>
  * 微信支付回调
  */
 public abstract class SheepWXPayEntryActivity extends Activity implements IWXAPIEventHandler {
 
     private static final String TAG = "SheepWXPayEntryActivity";
 
-    private IWXAPI api;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.pay_result);
 
-        api = WXAPIFactory.createWXAPI(this, Config.WX_PAY_APP_ID);
-        api.handleIntent(getIntent(), this);
+        SheepApp.getInstance().getWxApi().handleIntent(getIntent(), this);
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         setIntent(intent);
-        api.handleIntent(intent, this);
+        SheepApp.getInstance().getWxApi().handleIntent(intent, this);
     }
 
     @Override

+ 18 - 31
app/src/main/java/com/sheep/gamegroup/view/activity/ActXiaomiGame.java

@@ -21,6 +21,7 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.ViewHolder;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -68,25 +69,16 @@ public class ActXiaomiGame extends BaseActivity {
     public void initView() {
         activity = this;
         EventBus.getDefault().register(this);
+        //搜索
         TitleBarUtils.getInstance()
                 .setTitleFinish(activity)
                 .setShowOrHide(this, true)
                 .setTitle(activity, "小米游戏中心")
-                .setRightImgBotton(activity,
-                        R.drawable.search_black_img,
-                        new View.OnClickListener() {//搜索
-                            @Override
-                            public void onClick(View v) {
-                                Jump2View.getInstance().goGameSearch(activity, 1);
-                            }
-                        });
-        refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                isRefresh = true;
-                initData();
-                refresh.setRefreshing(false);
-            }
+                .setRightImgBotton(activity, R.drawable.search_black_img, v -> Jump2View.getInstance().goGameSearch(activity, 1));
+        refresh.setOnRefreshListener(() -> {
+            isRefresh = true;
+            initData();
+            refresh.setRefreshing(false);
         });
 
         view_list.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance()));
@@ -112,20 +104,20 @@ public class ActXiaomiGame extends BaseActivity {
                 View rootConvertView = holder.itemView;
                 View task_top = rootConvertView.findViewById(R.id.task_top);
                 task_top.setVisibility(View.GONE);
-                TextView item_money = (TextView)rootConvertView.findViewById(R.id.item_money);
-                TextView item_name_tv = (TextView)rootConvertView.findViewById(R.id.item_name_tv);
-                TextView item_num_tv = (TextView)rootConvertView.findViewById(R.id.item_num_tv);
-                TextView item_date_tv = (TextView)rootConvertView.findViewById(R.id.item_date_tv);
-                TextView detail_task_tv_center = (TextView)rootConvertView.findViewById(R.id.detail_task_tv_center);
+                TextView item_money = rootConvertView.findViewById(R.id.item_money);
+                TextView item_name_tv = rootConvertView.findViewById(R.id.item_name_tv);
+                TextView item_num_tv = rootConvertView.findViewById(R.id.item_num_tv);
+                TextView item_date_tv = rootConvertView.findViewById(R.id.item_date_tv);
+                TextView detail_task_tv_center = rootConvertView.findViewById(R.id.detail_task_tv_center);
                 item_money.setVisibility(View.GONE);
                 View line_tv = rootConvertView.findViewById(R.id.line_tv);
                 View detail_task_layout = rootConvertView.findViewById(R.id.detail_task_layout);
                 detail_task_layout.setVisibility(View.GONE);
 
-                GlideImageLoader.setGameImage((ImageView) rootConvertView.findViewById(R.id.item_icon_iv), item.getIcon());
-                item_name_tv.setText(item.getName()+"");
-                item_num_tv.setText(item.getType()+"");
-                item_date_tv.setText(DeviceIDUtil.newInstance().numberCnvert(item.getDownload_count_increment())+"人在玩");
+                GlideImageLoader.setGameImage(rootConvertView.findViewById(R.id.item_icon_iv), item.getIcon());
+                ViewUtil.setText(item_name_tv, item.getName());
+                ViewUtil.setText(item_num_tv, item.getType());
+                ViewUtil.setText(item_date_tv, DeviceIDUtil.newInstance().numberCnvert(item.getDownload_count_increment())+"人在玩");
                 detail_task_tv_center.setTag(PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + item.getDownload_url());
                 detail_task_tv_center.setVisibility(View.VISIBLE);
 
@@ -181,12 +173,7 @@ public class ActXiaomiGame extends BaseActivity {
             loadData(false, isRefresh);
         }catch (Exception e){
             e.printStackTrace();
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    loadData(false, isRefresh);
-                }
-            }, 500);
+            new Handler().postDelayed(() -> loadData(false, isRefresh), 500);
         }
 
 
@@ -216,7 +203,7 @@ public class ActXiaomiGame extends BaseActivity {
                                 if (page == 1)
                                     list.clear();
                                 CommonUtil.getInstance().updateEmptyView(empty_view, ListUtil.addAll(list, newList) == 0);
-                                view_list.getAdapter().notifyDataSetChanged();
+                                ViewUtil.notifyDataSetChanged(view_list);
                             }
                         } catch (Exception e) {
                             CommonUtil.getInstance().updateEmptyView(empty_view, true);

+ 155 - 185
app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -19,15 +19,14 @@ import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
-import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GameAgencyRechargePlatformEntity;
 import com.sheep.gamegroup.model.entity.OrienteeringDetail;
 import com.sheep.gamegroup.model.entity.PayEntity;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
+import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -70,9 +69,9 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
     /**
      * List view item text view tag
      */
-    public static final String PUBLIC_TAG_PREFIX_TEXTVIEW_LIST   = "PUBLIC_TAG_PREFIX_TEXTVIEW_LIST";
+    public static final String PUBLIC_TAG_PREFIX_TEXTVIEW_LIST = "PUBLIC_TAG_PREFIX_TEXTVIEW_LIST";
     private final static int TAG_ID_TEMP = R.id.view_tag_1;
-    private HashMap<View, SelfCountDownTimer> timerHashMap= new HashMap<>();
+    private HashMap<View, SelfCountDownTimer> timerHashMap = new HashMap<>();
     @Inject
     TryMakeMoneyPresenter presenter;
     private int from;// 1 来自主页
@@ -83,6 +82,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
     public TryMakeMoneyAdp(Context context) {
         super(context);
     }
+
     public TryMakeMoneyAdp(Context context, int from) {
         super(context);
         this.from = from;
@@ -92,7 +92,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
     public int getViewIdByType(int type) {
         int resId = R.layout.empty;
         RecyleType recyleType = RecyleType.values()[type];
-        switch (recyleType){
+        switch (recyleType) {
             case RELEASE_TASK:
             case BEGIN_TASK:
             case RUN_TASK:
@@ -107,7 +107,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 
     @Override
     public void convert(ViewHolder holder, RecyleObj recyleObj) {
-        switch (recyleObj.getRecyleType()){
+        switch (recyleObj.getRecyleType()) {
             case RELEASE_TASK:
                 bindReleaseTask(holder, (List<Release_task>) recyleObj.getDataObj(), 0);
                 break;
@@ -134,31 +134,36 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
     public int getItemViewType(int position) {
         return listData.get(position).getRecyleType().ordinal();
     }
+
     /**
      * 传入presenter
      */
-    public void addPresenter(TryMakeMoneyPresenter presenter){
+    public void addPresenter(TryMakeMoneyPresenter presenter) {
         this.presenter = presenter;
     }
+
     /**
      * 传入type
      */
-    public void addType(int type){
+    public void addType(int type) {
         this.type = type;
     }
-    public void addShowType(String show_type){
+
+    public void addShowType(String show_type) {
         this.show_type = show_type;
     }
+
     /**
      * 传入is_succession
      */
-    public void setIs_succession(int is_succession){
+    public void setIs_succession(int is_succession) {
         this.is_succession = is_succession;
     }
 
 
     /**
      * 我的游戏
+     *
      * @param holder
      * @param etyList
      */
@@ -184,44 +189,38 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
             @Override
             public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, final int i) {
                 final OrienteeringDetail item = ListUtil.getItem(etyList, i);
-                if(item == null){
+                if (item == null) {
                     return;
                 }
                 viewHolder.itemView.setTag(TAG_ID_TEMP, item.getId());
                 TextView detail_task_tv = viewHolder.itemView.findViewById(R.id.detail_task_tv);
                 viewHolder.itemView.findViewById(R.id.task_top).setVisibility(View.GONE);
 
-                if(i == getItemCount()-1){
+                if (i == getItemCount() - 1) {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
-                }else {
+                } else {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.VISIBLE);
                 }
                 detail_task_tv.setText("去充值");
-                ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                        "可定向消费:" + item.getBalance() +"元");
-                ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setTextColor(context.getResources().getColor(R.color.red_fd2d54));
+                ((TextView) viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                        "可定向消费:" + item.getBalance() + "元");
+                ((TextView) viewHolder.itemView.findViewById(R.id.item_date_tv)).setTextColor(context.getResources().getColor(R.color.red_fd2d54));
                 viewHolder.itemView.findViewById(R.id.item_date_question_img).setVisibility(View.VISIBLE);
-                viewHolder.itemView.findViewById(R.id.item_date_question_img).setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-
-                        ViewUtil.showMsgDialog(context,
-                                "游戏总金额"+ item.getBalance() +"元,按比例"+ item.getRatio() +"%进行消费,最低消费"+ item.getMin_amount() +"元。\n" +
-                                        "\n" +
-                                        "例如(消费100元可用"+ item.getRatio() +"元小绵羊定向消费金额)",
-                                "定向消费详情",
-                                false);
-                    }
-                });
+                viewHolder.itemView.findViewById(R.id.item_date_question_img).setOnClickListener(v -> ViewUtil.showMsgDialog(context,
+                        "游戏总金额" + item.getBalance() + "元,按比例" + item.getRatio() + "%进行消费,最低消费" + item.getMin_amount() + "元。\n" +
+                                "\n" +
+                                "例如(消费100元可用" + item.getRatio() + "元小绵羊定向消费金额)",
+                        "定向消费详情",
+                        false));
 
                 //CommonUtil.getInstance().getCharSequence(context, item.getName(), "")
-                ((TextView)viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(item.getName()+"");
+                ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_name_tv), item.getName());
                 final TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
                 task_type_tv.setVisibility(View.VISIBLE);
                 viewHolder.itemView.findViewById(R.id.item_money).setVisibility(View.GONE);
 
                 GlideImageLoader.setGameImage((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv), item.getIcon());
-                if(item.isGameReservationCantDownload()){
+                if (item.isGameReservationCantDownload()) {
                     task_type_tv.setEnabled(false);
                     detail_task_tv.setEnabled(false);
                     viewHolder.itemView.setEnabled(true);
@@ -229,16 +228,10 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                     task_type_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
                     detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
 
-                    viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            Jump2View.getInstance().goGameTaskDetailView(context,  item.getRelease_task_id(), item.getGame_id(),1);
-
-                        }
-                    });
+                    viewHolder.itemView.setOnClickListener(v -> Jump2View.getInstance().goGameTaskDetailView(context, item.getRelease_task_id(), item.getGame_id(), 1));
                     return;
                 }
-                if(TextUtils.isEmpty(item.getPackage_name())){
+                if (TextUtils.isEmpty(item.getPackage_name())) {
                     task_type_tv.setEnabled(false);
                     detail_task_tv.setEnabled(false);
                     viewHolder.itemView.setEnabled(false);
@@ -258,13 +251,13 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 final DownloadUtil mDownloadTaskService = new DownloadUtil();
 
                 String taskTypeTvValue;
-                if(isInstall){//已经安装
+                if (isInstall) {//已经安装
                     taskTypeTvValue = "启动游戏";
-                }else{
+                } else {
                     DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(item.getDownload_url());
-                    if(downLoadInfo == null) {
+                    if (downLoadInfo == null) {
                         taskTypeTvValue = "下载游戏";
-                    }else {
+                    } else {
                         Integer mStatus = downLoadInfo.getMStatus();
                         int taskState = mStatus == null ? 0 : mStatus;
                         switch (taskState) {
@@ -275,7 +268,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                                 taskTypeTvValue = CommonUtil.CONTINUE_DOWNLOAD;
                                 break;
                             case DownloadUtil.STATUS_FINISH:
-                                if(isExistApk){
+                                if (isExistApk) {
                                     taskTypeTvValue = "安装游戏";
                                 } else {
                                     taskTypeTvValue = CommonUtil.START_DOWNLOAD;
@@ -290,59 +283,44 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                         }
                     }
                 }
-                task_type_tv.setText(taskTypeTvValue+"");
+                task_type_tv.setText(taskTypeTvValue + "");
                 task_type_tv.setTag(PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + item.getDownload_url());
 //                TaskHelper.setNumText((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
 //                ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ item.getBonusText() +"元");
                 //任务领取
-                task_type_tv.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        try{
-                            switch (task_type_tv.getText().toString().trim() +""){
-                                case "安装游戏":
-                                    ApkUtils.installApk(SheepApp.getInstance(), PackageUtil.isExistsFile(item.getPackage_name(), item.getDownload_url()));
-                                    PackageUtil.startApp(SheepApp.getInstance(), item.getPackage_name());
-                                    break;
-                                case "启动游戏":
-                                    ApkUtils.installApk(SheepApp.getInstance(), PackageUtil.isExistsFile(item.getPackage_name(), item.getDownload_url()));
-                                    PackageUtil.startApp(SheepApp.getInstance(), item.getPackage_name());
-                                    break;
-                                default:
-                                    final DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(item);
-                                    mDownloadTaskService.start(downLoadInfo);
-                                    new Thread(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            if(mDownloadTaskService.addDownloadTask(downLoadInfo)){
-                                                //发送红点信息
-                                                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TIPS_DOWN_ICON));
-                                            }
+                task_type_tv.setOnClickListener(v -> {
+                    try {
+                        switch (task_type_tv.getText().toString().trim() + "") {
+                            case "安装游戏":
+                                ApkUtils.installApk(SheepApp.getInstance(), PackageUtil.isExistsFile(item.getPackage_name(), item.getDownload_url()));
+                                PackageUtil.startApp(SheepApp.getInstance(), item.getPackage_name());
+                                break;
+                            case "启动游戏":
+                                ApkUtils.installApk(SheepApp.getInstance(), PackageUtil.isExistsFile(item.getPackage_name(), item.getDownload_url()));
+                                PackageUtil.startApp(SheepApp.getInstance(), item.getPackage_name());
+                                break;
+                            default:
+                                final DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(item);
+                                mDownloadTaskService.start(downLoadInfo);
+                                new Thread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        if (mDownloadTaskService.addDownloadTask(downLoadInfo)) {
+                                            //发送红点信息
+                                            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TIPS_DOWN_ICON));
                                         }
-                                    }).start();
-                                    break;
-                            }
-                        }catch (Exception e){
-                            e.printStackTrace();
-                            G.showToast("服务器繁忙,请稍候再试!");
+                                    }
+                                }).start();
+                                break;
                         }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        G.showToast("服务器繁忙,请稍候再试!");
                     }
                 });
                 //去充值
-                detail_task_tv.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-
-                        ViewUtil.showGamePayAccount((Activity) context, item.getGame_id(), item.getName());
-                    }
-                });
-                viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Jump2View.getInstance().goGameTaskDetailView(context,  item.getRelease_task_id(), item.getGame_id(),1);
-
-                    }
-                });
+                detail_task_tv.setOnClickListener(v -> ViewUtil.showGamePayAccount((Activity) context, item.getGame_id(), item.getName()));
+                viewHolder.itemView.setOnClickListener(v -> Jump2View.getInstance().goGameTaskDetailView(context, item.getRelease_task_id(), item.getGame_id(), 1));
 //                TestUtil.setDebugDownLoad(context, viewHolder.itemView, item.getTask());
             }
 
@@ -352,8 +330,10 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
             }
         });
     }
- /**
+
+    /**
      * 游戏代充平台
+     *
      * @param holder
      * @param etyList
      */
@@ -379,7 +359,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
             @Override
             public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, final int i) {
                 final GameAgencyRechargePlatformEntity item = ListUtil.getItem(etyList, i);
-                if(item == null){
+                if (item == null) {
                     return;
                 }
                 View padding = viewHolder.itemView.findViewById(R.id.padding);
@@ -387,18 +367,18 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 TextView detail_task_tv_center = viewHolder.itemView.findViewById(R.id.detail_task_tv);
                 detail_task_tv_center.setVisibility(View.VISIBLE);
 
-                if(i == getItemCount()-1){
+                if (i == getItemCount() - 1) {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
-                }else {
+                } else {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
                 }
                 detail_task_tv_center.setText("充值");
 
                 //name
-                ((TextView)viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(item.getName()+"");
+                ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_name_tv), item.getName());
 
                 final TextView item_num_tv = viewHolder.itemView.findViewById(R.id.item_num_tv);
-                item_num_tv.setText(item.getDesc()+"");
+                ViewUtil.setText(item_num_tv, item.getDesc());
 
                 Glide.with(context)
                         .load(item.getIcon())
@@ -407,15 +387,12 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 
 
                 //去充值
-                detail_task_tv_center.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        PayEntity payEntity = new PayEntity();
-                        payEntity.setTask_type(item.getTask_type()+"");
-                        ViewUtil.newInstance().showGamePayAccount((Activity) context, payEntity);
+                detail_task_tv_center.setOnClickListener(v -> {
+                    PayEntity payEntity = new PayEntity();
+                    payEntity.setTask_type(item.getTask_type() + "");
+                    ViewUtil.newInstance().showGamePayAccount((Activity) context, payEntity);
 
 //                        ViewUtil.showGamePayAccount((Activity) context, item.getTask_type());
-                    }
                 });
             }
 
@@ -429,16 +406,16 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
     /**
      * 游戏代充
      */
-    private void bindGameReleaseTask(ViewHolder holder, final List<Release_task> etyList, final int isBegin){
+    private void bindGameReleaseTask(ViewHolder holder, final List<Release_task> etyList, final int isBegin) {
         RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
         recyclerView.setHasFixedSize(true);
         recyclerView.setLayoutManager(new LinearLayoutManager(context));
-        recyclerView.setAdapter(new RecyclerView.Adapter(){
+        recyclerView.setAdapter(new RecyclerView.Adapter() {
 
             @Override
             public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
                 LinearLayout view = (LinearLayout) LayoutInflater.from(context)
-                        .inflate(R.layout.try_makemoney_item_recommend, viewGroup,false);
+                        .inflate(R.layout.try_makemoney_item_recommend, viewGroup, false);
                 RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(view) {
                     @Override
                     public String toString() {
@@ -456,12 +433,12 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                     return;
                 }
                 viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
-                ((TextView) viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName() + "");
-                ((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv)).setText(taskReleaseEty.getTask().getDetailShow()+"");
-                ((TextView) viewHolder.itemView.findViewById(R.id.item_money)).setVisibility(View.GONE);
-                GlideImageLoader.setGameImage((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv), taskEty.getIcon());
+                ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_name_tv), taskReleaseEty.getName());
+                ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_num_tv), taskReleaseEty.getTask().getDetailShow());
+                ViewUtil.setVisibility(viewHolder.itemView.findViewById(R.id.item_money), false);
+                GlideImageLoader.setGameImage(viewHolder.itemView.findViewById(R.id.item_icon_iv), taskEty.getIcon());
                 viewHolder.itemView.setEnabled(false);
-                ((TextView) viewHolder.itemView.findViewById(R.id.item_date_tv)).setVisibility(View.GONE);
+                ViewUtil.setVisibility(viewHolder.itemView.findViewById(R.id.item_date_tv), false);
                 viewHolder.itemView.findViewById(R.id.task_top).setVisibility(View.GONE);
 
                 if (i == getItemCount() - 1) {
@@ -474,7 +451,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 TextView detail_task_tv_down = viewHolder.itemView.findViewById(R.id.detail_task_tv_down);
 
 
-                if(!taskReleaseEty.getTask().isCan_receive_account()){
+                if (!taskReleaseEty.getTask().isCan_receive_account()) {
 //                    detail_task_tv.setText("已有账号");
 //                    detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
 //                    detail_task_tv.setEnabled(false);
@@ -483,28 +460,20 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                     detail_task_tv_down.setVisibility(View.VISIBLE);
                     taskReleaseEty.getDownloadHelper().updateDownloadTaskView(true, taskEty, detail_task_tv_down);
                     detail_task_tv_down.setTag(PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + taskEty.getDownload_link());
-                }else {
+                } else {
                     detail_task_tv.setVisibility(View.VISIBLE);
                     detail_task_tv_down.setVisibility(View.GONE);
                     detail_task_tv.setText("领取帐号");
                     detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_bg_gradient_rectangle_blue));
                     detail_task_tv.setEnabled(true);
                     viewHolder.itemView.setEnabled(false);
-                    detail_task_tv.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            GAME_INSTEAD_OF_RECHARGE_GET.onEvent();
-                            CommonUtil.getInstance()
-                                    .gameAccountManager(context, Integer.parseInt(taskReleaseEty.getTask_id()), new Action1<BaseMessage>() {
-                                        @Override
-                                        public void call(BaseMessage baseMessage) {
-                                            G.showToast("领取成功");
-                                            EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.GENERATION_ACCOUNT_REFRESH));
-
-
-                                        }
-                                    });
-                        }
+                    detail_task_tv.setOnClickListener(v -> {
+                        GAME_INSTEAD_OF_RECHARGE_GET.onEvent();
+                        CommonUtil.getInstance()
+                                .gameAccountManager(context, Integer.parseInt(taskReleaseEty.getTask_id()), baseMessage -> {
+                                    G.showToast("领取成功");
+                                    EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.GENERATION_ACCOUNT_REFRESH));
+                                });
                     });
                 }
 
@@ -514,16 +483,13 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
                 task_type_tv.setText("立即充值");
                 task_type_tv.setVisibility(View.VISIBLE);
-                task_type_tv.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        GAME_INSTEAD_OF_RECHARGE_GAME.onEvent();
-                        PayEntity payEntity = new PayEntity();
-                        payEntity.setTask_type(taskEty.getTask_type()+"");
-                        payEntity.setGame_id(taskReleaseEty.getTask().getThird_task_id());
-                        payEntity.setGame_name(taskReleaseEty.getName());
-                        ViewUtil.newInstance().showGamePayAccount((Activity) context, payEntity);
-                    }
+                task_type_tv.setOnClickListener(v -> {
+                    GAME_INSTEAD_OF_RECHARGE_GAME.onEvent();
+                    PayEntity payEntity = new PayEntity();
+                    payEntity.setTask_type(taskEty.getTask_type() + "");
+                    payEntity.setGame_id(taskReleaseEty.getTask().getThird_task_id());
+                    payEntity.setGame_name(taskReleaseEty.getName());
+                    ViewUtil.newInstance().showGamePayAccount((Activity) context, payEntity);
                 });
 
             }
@@ -534,19 +500,20 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
             }
         });
     }
+
     /**
      * 获取已发布的
      */
-    private void bindReleaseTask(ViewHolder holder, final List<Release_task> etyList, final int isBegin){
+    private void bindReleaseTask(ViewHolder holder, final List<Release_task> etyList, final int isBegin) {
         RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
         recyclerView.setHasFixedSize(true);
         recyclerView.setLayoutManager(new LinearLayoutManager(context));
-        recyclerView.setAdapter(new RecyclerView.Adapter(){
+        recyclerView.setAdapter(new RecyclerView.Adapter() {
 
             @Override
             public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
                 LinearLayout view = (LinearLayout) LayoutInflater.from(context)
-                        .inflate(R.layout.try_makemoney_item_recommend, viewGroup,false);
+                        .inflate(R.layout.try_makemoney_item_recommend, viewGroup, false);
                 RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(view) {
                     @Override
                     public String toString() {
@@ -564,12 +531,13 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                     return;
                 }
                 viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
-                ((TextView) viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName() + "");
-                CommonUtil.getInstance().setTaskTag(context, viewHolder.itemView, taskReleaseEty,show_type);
-                ((TextView) viewHolder.itemView.findViewById(R.id.item_money)).setText("+" + taskReleaseEty.getBonusText() + "元");
+                ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_name_tv), taskReleaseEty.getName());
+                CommonUtil.getInstance().setTaskTag(context, viewHolder.itemView, taskReleaseEty, show_type);
+                ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_money), "+" + taskReleaseEty.getBonusText() + "元");
                 ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_money_vip_tv), taskReleaseEty.getVipBonusText());
+                ViewUtil.setVisibility(viewHolder.itemView.findViewById(R.id.item_money_vip_tv), true);
 
-                GlideImageLoader.setGameImage((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv), taskEty.getIcon());
+                GlideImageLoader.setGameImage(viewHolder.itemView.findViewById(R.id.item_icon_iv), taskEty.getIcon());
                 if (isBegin == 1 || type == 2) {//即将开始
                     viewHolder.itemView.setEnabled(false);
                     ((TextView) viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
@@ -617,18 +585,18 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 TextView detail_task_tv = viewHolder.itemView.findViewById(R.id.detail_task_tv);
 
 
-                if("0".equals(taskReleaseEty.getLast_num())){
+                if ("0".equals(taskReleaseEty.getLast_num())) {
                     detail_task_tv.setText(R.string.task_taken_all);
                     detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
                     detail_task_tv.setEnabled(false);
                     viewHolder.itemView.setEnabled(false);
-                }else {
-                    if(isBegin == 1 || type == 2){//即将开始
+                } else {
+                    if (isBegin == 1 || type == 2) {//即将开始
                         detail_task_tv.setText("即将开始");
                         detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
                         detail_task_tv.setEnabled(false);
                         viewHolder.itemView.setEnabled(false);
-                    } else if(taskEty.isGameReservationCantDownload()){//游戏任务中的预约任务,且不能下载情况下
+                    } else if (taskEty.isGameReservationCantDownload()) {//游戏任务中的预约任务,且不能下载情况下
                         detail_task_tv.setText("预约下载");
                         detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_bg_gradient_rectangle_blue));
                         detail_task_tv.setEnabled(true);
@@ -643,7 +611,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 
 
                 detail_task_tv.setOnClickListener(v -> {
-                    if(taskEty.isGameReservationCantDownload()) {//游戏任务中的预约任务,且不能下载情况下
+                    if (taskEty.isGameReservationCantDownload()) {//游戏任务中的预约任务,且不能下载情况下
                         Action1<Integer> action1 = type -> {
                             switch (type) {
                                 case 1:
@@ -651,7 +619,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                                     break;
                             }
                         };
-                        if(taskReleaseEty.getAccepted_task_id() < 1){//没有正在进行的任务
+                        if (taskReleaseEty.getAccepted_task_id() < 1) {//没有正在进行的任务
                             CommonUtil.getInstance().reservationGameTask(taskReleaseEty, action1);
                         } else {//先取消正在进行的任务
                             CommonUtil.getInstance().tryGiveUpTask(taskReleaseEty, action1);
@@ -673,11 +641,11 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                         taskEty.setBonus(taskReleaseEty.getBonusText());
                         taskEty.setRelease_task_id(taskReleaseEty.getId());
                         taskEty.setName(taskReleaseEty.getName());
-                        if("0".equals(taskReleaseEty.getLast_num())){
-                            Jump2View.getInstance().goTaskDetailView(context,  taskReleaseEty.getId(), true);
+                        if ("0".equals(taskReleaseEty.getLast_num())) {
+                            Jump2View.getInstance().goTaskDetailView(context, taskReleaseEty.getId(), true);
                             return;
                         }
-                        Jump2View.getInstance().goTaskDetailView(context,  taskReleaseEty.getId());
+                        Jump2View.getInstance().goTaskDetailView(context, taskReleaseEty.getId());
                     }
                 });
 
@@ -692,21 +660,22 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 
     /**
      * 暂时这么处理,也许以后也是列表了
+     *
      * @param holder
      * @param etyList
      */
-    private void bindRunTask(ViewHolder holder, final List<TaskAcceptedEty> etyList){
+    private void bindRunTask(ViewHolder holder, final List<TaskAcceptedEty> etyList) {
         RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
         recyclerView.setHasFixedSize(true);
 //        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(1,
 //                StaggeredGridLayoutManager.VERTICAL));
         recyclerView.setLayoutManager(new LinearLayoutManager(context));
-        recyclerView.setAdapter(new RecyclerView.Adapter(){
+        recyclerView.setAdapter(new RecyclerView.Adapter() {
 
             @Override
             public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
                 LinearLayout view = (LinearLayout) LayoutInflater.from(context)
-                        .inflate(R.layout.try_makemoney_item_recommend, viewGroup,false);
+                        .inflate(R.layout.try_makemoney_item_recommend, viewGroup, false);
                 RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(view) {
                     @Override
                     public String toString() {
@@ -721,43 +690,44 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 final TaskAcceptedEty taskAcceptedEty;
                 final Release_task taskReleaseEty;
                 final TaskEty taskEty;
-                if((taskAcceptedEty = ListUtil.getItem(etyList, i)) == null
+                if ((taskAcceptedEty = ListUtil.getItem(etyList, i)) == null
                         || (taskReleaseEty = taskAcceptedEty.getRelease_task()) == null
-                        || (taskEty = taskReleaseEty.getTask()) == null){
+                        || (taskEty = taskReleaseEty.getTask()) == null) {
                     return;
                 }
-                    viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
-                if(i == 0){
+                viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
+                if (i == 0) {
                     viewHolder.itemView.findViewById(R.id.task_top).setVisibility(View.VISIBLE);
                     viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
-                    ((TextView)viewHolder.itemView.findViewById(R.id.item_title_tv)).setText("进行中");
-                }else{
+                    ((TextView) viewHolder.itemView.findViewById(R.id.item_title_tv)).setText("进行中");
+                } else {
                     viewHolder.itemView.findViewById(R.id.task_top).setVisibility(View.GONE);
                 }
                 viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
 
 
-                ((TextView)viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName()+"");
-                CommonUtil.getInstance().setTaskTag(context, viewHolder.itemView, taskReleaseEty,show_type);
-                ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ taskReleaseEty.getBonusText() +"元");
+                ((TextView) viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName() + "");
+                CommonUtil.getInstance().setTaskTag(context, viewHolder.itemView, taskReleaseEty, show_type);
+                ((TextView) viewHolder.itemView.findViewById(R.id.item_money)).setText("+" + taskReleaseEty.getBonusText() + "元");
                 ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_money_vip_tv), taskReleaseEty.getVipBonusText());
-                if(!taskReleaseEty.getDeadline().equals("永久")){
-                    ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                            "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT_DD, Long.valueOf(taskReleaseEty.getDeadline()))+"");
-                }else {
-                    ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                ViewUtil.setVisibility(viewHolder.itemView.findViewById(R.id.item_money_vip_tv), true);
+                if (!taskReleaseEty.getDeadline().equals("永久")) {
+                    ((TextView) viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                            "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT_DD, Long.valueOf(taskReleaseEty.getDeadline())) + "");
+                } else {
+                    ((TextView) viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
                             "截止时间:" + taskReleaseEty.getDeadline());
                 }
 
-                ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setText(R.string.cancel);
+                ((TextView) viewHolder.itemView.findViewById(R.id.detail_task_tv)).setText(R.string.cancel);
 
-                if((is_succession == 1 || is_succession == 3)
-                        &&  (taskAcceptedEty.getChild_task_id() > 1
-                                || (taskAcceptedEty.getChild_task_id() == 1
+                if ((is_succession == 1 || is_succession == 3)
+                        && (taskAcceptedEty.getChild_task_id() > 1
+                        || (taskAcceptedEty.getChild_task_id() == 1
                         && (taskAcceptedEty.getStatus() == 6 || taskAcceptedEty.getStatus() == 7 || taskAcceptedEty.getStatus() == 9)))
-                        ){
+                ) {
                     viewHolder.itemView.findViewById(R.id.detail_task_tv).setVisibility(View.GONE);
-                }else {
+                } else {
 
                     viewHolder.itemView.findViewById(R.id.detail_task_tv).setVisibility(View.VISIBLE);
                 }
@@ -792,7 +762,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                     @Override
                     public void onClick(View v) {
                         TaskAcceptedEty item = ListUtil.getItem(etyList, i);
-                        if(item == null){
+                        if (item == null) {
                             return;
                         }
                         UMConfigUtils.IdEvent.TASK.commit(item.getRelease_task_id());
@@ -802,7 +772,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                         taskEty.setRelease_task_id(taskReleaseEty.getId());
                         taskEty.setAcceptedTaskId(taskAcceptedEty.getId());
                         taskEty.setName(taskReleaseEty.getName());
-                        Jump2View.getInstance().goTaskDetailView(context,  taskReleaseEty.getId());
+                        Jump2View.getInstance().goTaskDetailView(context, taskReleaseEty.getId());
                         UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DETAIL);
                     }
                 });
@@ -812,14 +782,14 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                   倒计时
                  */
                 final TextView countdown_tv = viewHolder.itemView.findViewById(R.id.end_of_time_tv);
-                if(taskAcceptedEty.getEnd_time() > 0){
+                if (taskAcceptedEty.getEnd_time() > 0) {
                     SelfCountDownTimer scTimer = timerHashMap.get(countdown_tv);
-                    if(scTimer != null){
+                    if (scTimer != null) {
                         scTimer.cancel();
                     }
 
                     countdown_tv.setVisibility(View.VISIBLE);
-                    SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( taskAcceptedEty.getEnd_time() * 1000, 1000, taskReleaseEty.getCancel_duration()) {
+                    SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer(taskAcceptedEty.getEnd_time() * 1000, 1000, taskReleaseEty.getCancel_duration()) {
                         @Override
                         public void onTimerRest() {
                             countdown_tv.setText("");
@@ -841,7 +811,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                     selfCountDownTimer.reset(taskReleaseEty.getCancel_duration());
                     selfCountDownTimer.start();
                     timerHashMap.put(countdown_tv, selfCountDownTimer);
-                }else {
+                } else {
                     countdown_tv.setVisibility(View.GONE);
                 }
 
@@ -871,19 +841,19 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
         timerHashMap.clear();
     }
 
-    public void refreshAdapter(){
+    public void refreshAdapter() {
         notifyDataSetChanged();
     }
 
     public boolean isEmpty() {
-        switch (type){
+        switch (type) {
             case 0://推荐任务
                 RecyleObj item;
-                if((item = ListUtil.getItem(listData, 0)) != null
+                if ((item = ListUtil.getItem(listData, 0)) != null
                         && item.getRecyleType() == RUN_TASK
-                        && !ListUtil.isEmpty((List<TaskAcceptedEty>)item.getDataObj())){
+                        && !ListUtil.isEmpty((List<TaskAcceptedEty>) item.getDataObj())) {
                     return false;
-                }else {
+                } else {
                     return true;
                 }
             case 2://即将开始

+ 2 - 1
app/src/main/res/layout/try_makemoney_item_recommend.xml

@@ -218,7 +218,8 @@
                 android:minWidth="@dimen/find_bt_with"
                 android:text="会员:+11元"
                 android:textColor="#C3995E"
-                android:textSize="10sp" />
+                android:textSize="10sp"
+                android:visibility="gone"/>
             <View
                 android:layout_width="1dp"
                 android:layout_height="0dp"