添加游戏打点

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

@@ -95,13 +95,7 @@ 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

@@ -263,7 +263,7 @@ public class Jump2View {
                                         .preload(800, 800);
                             }
 
-                            if(userEntity != null && userEntity.canBindMobile()){//老用户没有绑定手机号，且没有展示过绑定手机号界面
+                            if(userEntity != null && userEntity.canBindMobile() && !BuildConfig.DEBUG){//老用户没有绑定手机号，且没有展示过绑定手机号界面
                                 Jump2View.getInstance().goBindPhone(activity, 1);
                                 return;
                             }

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

@@ -140,6 +140,11 @@ public class UMConfigUtils {
         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
         ;
         private String tag;
 

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

@@ -742,8 +742,8 @@ public class ViewUtil {
     /**
      * 添加游戏账户
      */
-    public void showAddAccount(Activity activity){
-        new DialogAddAccount(activity).showAddAccount();
+    public void showAddAccount(Activity activity, Action1<Integer> action1){
+        new DialogAddAccount(activity).showAddAccount(action1);
     }
 
 }

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

@@ -29,6 +29,7 @@ import org.greenrobot.eventbus.Subscribe;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT_ADD;
@@ -66,7 +67,12 @@ public class ActGameAccount extends BaseActivity {
                         new View.OnClickListener() {
                             @Override
                             public void onClick(View v) {
-                                ViewUtil.newInstance().showAddAccount(activity);
+                                ViewUtil.newInstance().showAddAccount(activity, new Action1<Integer>() {
+                                    @Override
+                                    public void call(Integer integer) {
+                                        initData();
+                                    }
+                                });
                                 USER_GAME_ACCOUNT_ADD.onEvent();
                             }
                         });

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

@@ -31,6 +31,9 @@ import java.util.List;
 import rx.functions.Action1;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN_SURE;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT_DEL;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT_DEL_COMMIT;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT_LOOK;
 
 /**
  * Created by ljy on 2018/7/10.
@@ -116,20 +119,20 @@ public class AdpGameAccount extends AdpCommonRecy<RecyleObj> {
                 look_tv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        ViewUtil.newInstance()
-                                .showGameAccountDetail((Activity) context, item.getId());
+                        USER_GAME_ACCOUNT_LOOK.onEvent();
+                        ViewUtil.newInstance().showGameAccountDetail((Activity) context, item.getId());
                     }
                 });
                 delete_layout.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-
+                        USER_GAME_ACCOUNT_DEL.onEvent();
                         ViewUtil.showMsgDialog(context, new DialogConfig().setTitle("删除确认").setMsg("确定删除吗？").setBtnRightText("取消")
                                 .setBtnLeftText("确定").setBtnLeftOnClickListener(new View.OnClickListener() {
                                     @Override
                                     public void onClick(View view) {
-//                                        USER_CLEAN_SURE.onEvent();
-                                        CommonUtil.getInstance().deleteGameAccount(context, 0, new Action1<Integer>() {
+                                        USER_GAME_ACCOUNT_DEL_COMMIT.onEvent();
+                                        CommonUtil.getInstance().deleteGameAccount(context, item.getId(), new Action1<Integer>() {
                                             @Override
                                             public void call(Integer integer) {
                                                 if (integer == 1){

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAddAccount.java

@@ -36,6 +36,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT_ADD_COMMIT;
@@ -82,7 +83,7 @@ public class DialogAddAccount {
         }
     };
 
-    public void showAddAccount() {
+    public void showAddAccount(final Action1<Integer> action1) {
         if (activity == null)
             return;
         platformData();
@@ -210,14 +211,15 @@ public class DialogAddAccount {
                             public void onError(BaseMessage baseMessage) {
 
                                 ViewUtil.newInstance().hideProgress(activity);
-                                G.showToast(baseMessage.getMsg() + "");
+                                G.showToast(baseMessage);
                             }
 
                             @Override
                             public void onNext(BaseMessage baseMessage) {
                                 ViewUtil.newInstance().hideProgress(activity);
-                                G.showToast(baseMessage.getMsg() + "");
-
+                                G.showToast(baseMessage);
+                                if(action1 != null)
+                                    action1.call(1);
                                 dialog.dismiss();
                             }
                         });

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogModifyAccount.java

@@ -25,6 +25,9 @@ import org.greenrobot.eventbus.EventBus;
 
 import rx.functions.Action1;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT_LOOK_MODIFY;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT_LOOK_MODIFY_COMMIT;
+
 
 /**
  * 修改游戏账号密码
@@ -101,6 +104,7 @@ public class DialogModifyAccount {
                         dialog.dismiss();
                         break;
                     case "立即修改":
+                        USER_GAME_ACCOUNT_LOOK_MODIFY_COMMIT.onEvent();
                         String game_new_pwd_ets = game_new_pwd_et.getText().toString().trim() + "";
                         if(TextUtils.isEmpty(game_new_pwd_ets)){
                             G.showToast("请输入新密码");
@@ -129,7 +133,7 @@ public class DialogModifyAccount {
         modify_pwd_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                USER_GAME_ACCOUNT_LOOK_MODIFY.onEvent();
                 Message message = new Message();
                 message.what = 0;
                 message.obj = View.VISIBLE;

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

@@ -78,6 +78,8 @@
         android:layout_height="wrap_content"
         android:background="@drawable/sp_bg_blue_stroke"
         android:hint="输入游戏帐号"
+        android:maxLength="20"
+        android:singleLine="true"
         android:minWidth="@dimen/view_size_150"
         android:paddingTop="@dimen/content_padding_small"
         android:paddingBottom="@dimen/content_padding_small"
@@ -101,7 +103,9 @@
         android:layout_marginTop="@dimen/common_margin_10"
         android:background="@drawable/sp_bg_blue_stroke"
         android:hint="输入密码"
-        android:inputType="number"
+        android:inputType="textPassword"
+        android:singleLine="true"
+        android:maxLength="20"
         android:minWidth="@dimen/view_size_150"
         android:paddingTop="@dimen/content_padding_small"
         android:paddingBottom="@dimen/content_padding_small"