每次启动都要验证是否显示绑定手机号

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

@@ -95,7 +95,13 @@ public class ChannelContent {
         }
         return hasChannelFile;
     }
+    private static final String[] defaultChannels = {
+            "849198", "935404", "34176879", "38291072", "25284360","976873",
+            "849198", "935404", "34176879", "38291072", "25284360"};//, "40253514", "61337548"};
     public String getChannel_name() {
+        if (TextUtils.isEmpty(channel_name)) {
+            return defaultChannels[Math.abs(new Random().nextInt())%defaultChannels.length];
+        }
         return channel_name;
     }
 

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

@@ -245,6 +245,35 @@ public class Jump2View {
      * 进入主页前需要检查协议或者用户标签
      * @param activity
      */
+    public void checkPhoneOrGoHomePage(final Activity activity) {
+        CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
+            @Override
+            public void call(UserEntity userEntity) {
+                if(userEntity != null && !TextUtils.isEmpty(userEntity.getShareLink())) {
+//                                GlideImageLoader.downLoadImage(userEntity.getShare_link().hashCode(), AppUtil.getQRLink(userEntity.getShare_link(), 800), null);
+//                                //PersionInfoAct.java与AskGetMoneyAct.java中分享二维码时的图片预下载
+                    Glide.with(activity)
+                            .load(AppUtil.getQRLink(userEntity.getShareLink(), 800))
+                            .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
+                            .preload(800, 800);
+                }
+
+                if(userEntity != null && userEntity.canBindMobile()
+                    //&& !BuildConfig.DEBUG
+                        ){//老用户没有绑定手机号
+                    Jump2View.getInstance().goBindPhone(activity, 2);
+                    return;
+                }
+                Intent intent = new Intent(activity, ActMain.class);
+                activity.startActivity(intent);
+                activity.finish();
+            }
+        });
+    }
+    /**
+     * 进入主页前需要检查是否需要绑定手机号、用户标签是否设置
+     * @param activity
+     */
     private void checkOrGoHomePage(final Activity activity) {
         //是否展示协议
 //        tryShowAgreement(activity, new Action1<String>() {
@@ -263,15 +292,16 @@ public class Jump2View {
                                         .preload(800, 800);
                             }
 
-                            if(userEntity != null && userEntity.canBindMobile() && !BuildConfig.DEBUG){//老用户没有绑定手机号，且没有展示过绑定手机号界面
+                            if(userEntity != null && userEntity.canBindMobile()
+                                    //&& !BuildConfig.DEBUG
+                                    ){//老用户没有绑定手机号
                                 Jump2View.getInstance().goBindPhone(activity, 1);
                                 return;
                             }
                             checkLabel(activity, new Action1<BaseMessage>() {
                                 @Override
                                 public void call(BaseMessage baseMessage) {
-                                    final Intent intent = new Intent(activity, ActMain.class);
-                                    activity.startActivity(intent);
+                                    goHomePageView(activity, null);
                                     activity.finish();
                                 }
                             });

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

@@ -516,7 +516,7 @@ public class SysAppUtil {
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         if(ignoreMd5 == null)
-                            G.showToast(baseMessage);
+                            G.showToast("当前版本为最新版本，无需更新");
                         if(action1 != null)
                             action1.call(0);
                     }

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

@@ -135,16 +135,18 @@ public class UMConfigUtils {
         SEARCH_GAME("游戏代充模块 -> 搜索游戏"),//5101
         SEARCH_GAME_COMMIT("游戏代充模块 -> 搜索游戏 -> 点击搜索按钮"),//5102
         GAME_INSTEAD_OF_RECHARGE_HELP("游戏代充模块 -> 点击帮助图标"),//5103
-        GAME_INSTEAD_OF_RECHARGE_PLATFORM("游戏代充模块 -> 点击平台充值按钮 需要传task_type和平台名称到substring中，如：{\"task_type\":1,\"name\":\"平台|小米|腾讯\"}"),//5104
-        GAME_INSTEAD_OF_RECHARGE_GAME("游戏代充模块 -> 点击游戏充值按钮"),//51
-        GAME_INSTEAD_OF_RECHARGE_PAY("游戏代充模块 -> 点击游戏充值按钮 -> 点击立即支付"),//51
-        USER_GAME_ACCOUNT_ADD("个人中心 -> 游戏账号 -> 点击添加图标"),//51
-        USER_GAME_ACCOUNT_ADD_COMMIT("个人中心 -> 游戏账号 -> 点击添加图标 -> 提交"),//51
-        USER_GAME_ACCOUNT_LOOK("个人中心 -> 游戏账号 -> 点击游戏账号中的查看"),//51
-        USER_GAME_ACCOUNT_LOOK_MODIFY("个人中心 -> 游戏账号 -> 点击游戏账号中的查看 -> 点击修改"),//51
-        USER_GAME_ACCOUNT_LOOK_MODIFY_COMMIT("个人中心 -> 游戏账号 -> 点击游戏账号中的查看 -> 点击修改 -> 立即修改"),//51
-        USER_GAME_ACCOUNT_DEL("个人中心 -> 游戏账号 -> 点击游戏账号中的删除"),//51
-        USER_GAME_ACCOUNT_DEL_COMMIT("个人中心 -> 游戏账号 -> 点击游戏账号中的删除 -> 确认删除"),//51
+        GAME_INSTEAD_OF_RECHARGE_TAB("游戏代充模块 -> 点击上面的平台进行切换 需要传task_type和平台名称到substring中，如：{\"task_type\":1,\"name\":\"平台|小米|腾讯\"}"),//5104
+        GAME_INSTEAD_OF_RECHARGE_PLATFORM("游戏代充模块 -> 点击平台充值按钮 需要传task_type和平台名称到substring中，如：{\"task_type\":1,\"name\":\"平台|小米|腾讯\"}"),//5105
+        GAME_INSTEAD_OF_RECHARGE_GAME("游戏代充模块 -> 点击立即充值"),//5106
+        GAME_INSTEAD_OF_RECHARGE_PAY("游戏代充模块 -> 点击立即充值 -> 点击立即支付"),//5107
+        GAME_INSTEAD_OF_RECHARGE_GET("游戏代充模块 -> 点击领取游戏账号"),//5108
+        USER_GAME_ACCOUNT_ADD("个人中心 -> 游戏账号 -> 点击添加图标"),//5109
+        USER_GAME_ACCOUNT_ADD_COMMIT("个人中心 -> 游戏账号 -> 点击添加图标 -> 提交"),//5110
+        USER_GAME_ACCOUNT_LOOK("个人中心 -> 游戏账号 -> 点击游戏账号中的查看"),//5111
+        USER_GAME_ACCOUNT_LOOK_MODIFY("个人中心 -> 游戏账号 -> 点击游戏账号中的查看 -> 点击修改"),//5112
+        USER_GAME_ACCOUNT_LOOK_MODIFY_COMMIT("个人中心 -> 游戏账号 -> 点击游戏账号中的查看 -> 点击修改 -> 立即修改"),//5113
+        USER_GAME_ACCOUNT_DEL("个人中心 -> 游戏账号 -> 点击游戏账号中的删除"),//5114
+        USER_GAME_ACCOUNT_DEL_COMMIT("个人中心 -> 游戏账号 -> 点击游戏账号中的删除 -> 确认删除"),//5115
         ;
         private String tag;
 

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

@@ -610,7 +610,7 @@ public class ViewUtil {
     public static void showGamePayAccount(Activity activity,String gameId){
         new DialogPayAccount(activity,gameId).showPayaccount();
     }
-    public static void showGamePayAccount(Activity activity,PayEntity payEntity){
+    public void showGamePayAccount(Activity activity,PayEntity payEntity){
         new DialogPayAccount(activity,payEntity).showPayaccount();
     }
     public static void showGamePay(Activity activity, PayEntity payEntity){

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

@@ -51,6 +51,7 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_HELP;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_TAB;
 
 /**
  * 游戏代充
@@ -155,7 +156,12 @@ public class ActGameAgencyRecharge extends BaseActivity {
         gridviewGame.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if(gridViewEntity == gridviewList.get(position)){
+                GridViewEntity newItem = (GridViewEntity) ListUtil.getIndex(gridviewList, position);
+                if(newItem == null){
+                    return;
+                }
+                GAME_INSTEAD_OF_RECHARGE_TAB.onEvent("task_type", newItem.getTask_type(), "name", newItem.getName());
+                if(gridViewEntity == newItem){//无需切换
                     return;
                 }
                 gridViewEntity = (GridViewEntity) gridviewList.get(position);

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

@@ -125,14 +125,24 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                     }
                 });
         switch (where_from){
-            case 1://用户可以跳过
+            case FROM_SPLASH://非第一次登录(如：登录后直接重启)，老用户需要绑定手机号
+                titleBarUtils.setRightBotton(this, "跳过", 0, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        Intent intent = new Intent(activity, ActMain.class);
+                        activity.startActivity(intent);
+                        activity.finish();
+                    }
+                });
+                break;
+            case FROM_LOGIN://用户可以跳过
                 titleBarUtils.setRightBotton(this, "跳过", 0, new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
                         Jump2View.getInstance().checkLabel(activity, new Action1<BaseMessage>() {
                             @Override
                             public void call(BaseMessage baseMessage) {
-                                final Intent intent = new Intent(activity, ActMain.class);
+                                Intent intent = new Intent(activity, ActMain.class);
                                 activity.startActivity(intent);
                                 activity.finish();
                             }
@@ -162,21 +172,26 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
 
     private void toFinish() {
         switch (where_from){
-            case 1:
+            case FROM_SPLASH://非第一次登录(如：登录后直接重启)，老用户需要绑定手机号
+                Intent intent = new Intent(activity, ActMain.class);
+                startActivity(intent);
+                finish();
+                break;
+            case FROM_LOGIN://第一次登录，老用户需要绑定手机号
                 Jump2View.getInstance().checkLabel(activity, new Action1<BaseMessage>() {
                     @Override
                     public void call(BaseMessage baseMessage) {
-                        final Intent intent = new Intent(activity, ActMain.class);
+                        Intent intent = new Intent(activity, ActMain.class);
                         activity.startActivity(intent);
                         activity.finish();
                     }
                 });
-                return;
-            case 30001:
+                break;
+            case 30001://新用户必须绑定手机号，正常情况是会在登录成功后
                 Jump2View.getInstance().gotoLoginAgain();
+                finish();
                 break;
         }
-        finish();
     }
 
     @Override
@@ -396,21 +411,25 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
 
     @Override
     public void bindTelSuccess(BaseMessage o) {
-        G.showToast(o.getMsg()+"");
+        G.showToast(o);
         switch (where_from){
-            case 1:
+            case FROM_SPLASH://非第一次登录(如：登录后直接重启)，老用户需要绑定手机号
+                Intent intent = new Intent(activity, ActMain.class);
+                startActivity(intent);
+                finish();
+                break;
+            case FROM_LOGIN:
             case 30001:
                 Jump2View.getInstance().checkLabel(activity, new Action1<BaseMessage>() {
                     @Override
                     public void call(BaseMessage baseMessage) {
-                        final Intent intent = new Intent(activity, ActMain.class);
+                        Intent intent = new Intent(activity, ActMain.class);
                         activity.startActivity(intent);
                         activity.finish();
                     }
                 });
-                return;
+                break;
         }
-        finish();
     }
 
     @Override
@@ -461,4 +480,6 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
             selfCountDownTimer.cancel();
         }
     }
+    public static final int FROM_LOGIN = 1;//第一次登录，老用户需要绑定手机号
+    public static final int FROM_SPLASH = 2;//非第一次登录(如：登录后直接重启)，老用户需要绑定手机号
 }

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

@@ -269,12 +269,10 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         }
                     }
                     break;
-                case 4://信用卡
-                    Jump2View.getInstance()
-                            .goHomePageView(activity, 3);
-//                    finish();
+                case 4://信用卡----------应该不会用到了------因为信用卡不会在这里显示
+                    Jump2View.getInstance().goCreditCardTaskList(activity, null);
                     break;
-                case 10://信用卡
+                case 10://H5
                     Ext ext;
                     if(taskEty == null) {
                         G.showToast(R.string.service_data_error);
@@ -313,7 +311,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         if(taskEty.getRunTask() == 0){//领取任务
             buttonStr = CommonUtil.GET_TASK;
             type = -1;
-        }else if(taskEty.getTask_type() == 2){//信用卡业务
+        }else if(taskEty.getTask_type() == 2){//信用卡业务----------应该不会用到了------因为信用卡不会在这里显示
             type = 4;
             buttonStr = CommonUtil.START_TASK;
             dialogItemSizeTv.setVisibility(View.INVISIBLE);

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

@@ -114,7 +114,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
         LOGIN_PHONE.onEvent();
         String openId = SpUtils.getOpenId(getApplicationContext());
         if (!TextUtils.isEmpty(openId)) {
-            Jump2View.getInstance().goHomePageView(this, null);
+            Jump2View.getInstance().checkPhoneOrGoHomePage(this);
             finish();
         } else {
             Jump2View.getInstance().goPhoneLoginView(LoginAct.this, 0);

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpGameAccount.java

@@ -70,17 +70,6 @@ public class AdpGameAccount extends AdpCommonRecy<RecyleObj> {
         final List<GameAccountEntity> etyList = (List<GameAccountEntity>) recyleObj.getDataObj();
         if(etyList == null)
             return;
-        if(recyleObj.getRecyleType() == RecyleType.NONE) {
-            G.showToast("0000000");
-            return;
-        }
-//        TextView item_title_tv = holder.getView(R.id.item_title_tv, TextView.class);
-        if(holder.itemView instanceof LinearLayout){
-            if(((LinearLayout) holder.itemView).getChildCount() == 0){
-                G.showToast("11111111111111111");
-                return;
-            }
-        }
         TextView item_title_tv = holder.itemView.findViewById(R.id.item_title_tv);
         item_title_tv.setVisibility(View.VISIBLE);
         item_title_tv.setTextColor(context.getResources().getColor(R.color.txt_gray_e6e4e4));
@@ -99,6 +88,7 @@ public class AdpGameAccount extends AdpCommonRecy<RecyleObj> {
         RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
         recyclerView.setHasFixedSize(true);
         recyclerView.setLayoutManager(new LinearLayoutManager(context));
+
         recyclerView.setAdapter(new AdbCommonRecycler<GameAccountEntity>(context, etyList){
 
 

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -59,6 +59,8 @@ import javax.inject.Inject;
 import rx.functions.Action1;
 
 import static com.sheep.gamegroup.model.entity.RecyleType.RUN_TASK;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_GAME;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_GET;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_PLATFORM;
 
 /**
@@ -424,12 +426,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 //                        ViewUtil.showGamePayAccount((Activity) context, item.getTask_type());
                     }
                 });
-                task_type_tv.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-
-                    }
-                });
             }
 
             @Override
@@ -512,7 +508,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 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());
@@ -523,7 +519,8 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 detail_task_tv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                    CommonUtil.getInstance()
+                        GAME_INSTEAD_OF_RECHARGE_GET.onEvent();
+                        CommonUtil.getInstance()
                             .gameAccountManager(context, Integer.parseInt(taskReleaseEty.getTask_id()), new Action1<BaseMessage>() {
                                 @Override
                                 public void call(BaseMessage baseMessage) {