修复类型转换问题

app/src/main/java/com/sheep/gamegroup/statistics/AppStatistics.java

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.statistics;
 
 import com.alibaba.fastjson.JSONObject;
+import com.googlecode.protobuf.format.util.TextUtils;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -46,11 +47,12 @@ public class AppStatistics {
      */
     public void sendDataToServer(int type,int subType,String subString){
         String openid = PreferenceUtils.getPrefString(SheepApp.mContext, UMConfigUtils.LOGIN_OPENID,"");
+
         String deviceId = DeviceUtil.getDeviceId(SheepApp.mContext);
         ApiService apiService =SheepApp.getInstance().getNetComponent().getApiService();
         JSONObject jsonObject = new JSONObject();
         //openid要转换成int类型
-        jsonObject.put("uid",Integer.valueOf(openid));
+        jsonObject.put("uid",android.text.TextUtils.isEmpty(openid)?0:Integer.valueOf(openid));
         jsonObject.put("type",type);
         jsonObject.put("subtype",subType);
         jsonObject.put("substring",subString);

app/src/main/java/com/sheep/gamegroup/statistics/AppStatisticsConfig.java

@@ -6,7 +6,7 @@ package com.sheep.gamegroup.statistics;
 
 public class AppStatisticsConfig {
 
-    public static class PType{
+    public static class SuperType{
         //dau 当日有登录过的账号数量使用
         public static final int DAU = 1000;
         //任务完成时间
@@ -22,65 +22,65 @@ public class AppStatisticsConfig {
     /**
      * 用于DAU统计用户相关
      */
-    public static class UserSignType{
+    public static class DauSubType{
         //登录
-        public static final int signIn = 1000;
+        public static final int signIn = 1001;
         //登出
-        public static final int signOff = 1001;
+        public static final int signOff = 1002;
     }
 
     /**
      * 统计点击次数需要的子subtype
      */
-    public static class SubType{
+    public static class ClickSubType{
         //游戏下载次数
-        public static final int game_download = 1000;
+        public static final int game_download = 5001;
         //广告点击次数
-        public static final int banner_click_horizontal = 1001;
+        public static final int banner_click_horizontal = 5002;
         //游戏页签
-        public static final int tab_game = 1002;
+        public static final int tab_game = 5003;
         //分类页签
-        public static final int tab_category = 1003;
+        public static final int tab_category = 5004;
         //小绵羊页签
-        public static final int tab_sheep = 1004;
+        public static final int tab_sheep = 5005;
         //借着玩页签
-        public static final int tab_jiezhewan = 1005;
+        public static final int tab_jiezhewan = 5006;
         //信用卡页签
-        public static final int tab_creditcard = 1006;
+        public static final int tab_creditcard = 5007;
         //试玩赚钱
-        public static final int sheep_task_try = 1007;
+        public static final int sheep_task_try = 5008;
         //邀请赚钱
-        public static final int sheep_task_invite = 1008;
+        public static final int sheep_task_invite = 5009;
         //躺着赚钱
-        public static final int sheep_task_lie = 1009;
+        public static final int sheep_task_lie = 5010;
         //提现
-        public static final int sheep_tixian = 1010;
+        public static final int sheep_tixian = 5011;
         //任务详情
-        public static final int task_detail = 1011;
+        public static final int task_detail = 5012;
         //任务详情中->下载游戏
-        public static final int task_download = 1012;
+        public static final int task_download = 5013;
         //任务详情中->上传截图
-        public static final int task_upload_picture = 1013;
+        public static final int task_upload_picture = 5014;
         //个人中心 -> 账号安全
-        public static final int user_account_safe = 1014;
+        public static final int user_account_safe = 5015;
         //个人中心 -> 任务记录
-        public static final int user_task_record = 1015;
+        public static final int user_task_record = 5016;
         //个人中心 -> 提现明细
-        public static final int user_tixian_detail = 1016;
+        public static final int user_tixian_detail = 5017;
         //账号安全 -> 绑定手机号（确定按钮）
-        public static final int user_bind_phone = 1017;
+        public static final int user_bind_phone = 5018;
         //账号安全 -> 绑定微信号（立即绑定按钮）
-        public static final int user_bind_weixin = 1018;
+        public static final int user_bind_weixin = 5019;
         //账号安全 -> 实名认证（提交按钮）
-        public static final int user_authentication = 1019;
+        public static final int user_authentication = 5020;
         //账号安全 -> 退出登录按钮
-        public static final int user_logout = 1020;
+        public static final int user_logout = 5021;
         //搜索界面-> 搜索按钮
-        public static final int game_search = 1021;
+        public static final int game_search = 5022;
         //主界面右上角 -> 下载管理按钮
-        public static final int game_download_manager = 1022;
+        public static final int game_download_manager = 5023;
         //接取任务
-        public static final int task_accept = 1023;
+        public static final int task_accept = 5024;
     }
 
 

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

@@ -68,7 +68,7 @@ public class UMConfigUtils {
         MobclickAgent.onProfileSignIn(source,openid);
 
         //自己的统计信息
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.PType.DAU,AppStatisticsConfig.UserSignType.signIn,"");
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.DAU,AppStatisticsConfig.DauSubType.signIn,"");
     }
 
     /**
@@ -78,7 +78,7 @@ public class UMConfigUtils {
         MobclickAgent.onProfileSignOff();
 
         //自己的统计退出
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.PType.DAU,AppStatisticsConfig.UserSignType.signOff,"");
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.DAU,AppStatisticsConfig.DauSubType.signOff,"");
     }
 
 
@@ -91,58 +91,58 @@ public class UMConfigUtils {
         //本服数据统计
         int subType = 0;
         if(event.equals(Event.GAME_DOWNLOAD)){
-            subType = AppStatisticsConfig.SubType.game_download;
+            subType = AppStatisticsConfig.ClickSubType.game_download;
         }else if(event.equals(Event.BANNER_CLICK_HORIZONTAL)){
-            subType = AppStatisticsConfig.SubType.banner_click_horizontal;
+            subType = AppStatisticsConfig.ClickSubType.banner_click_horizontal;
         }else if(event.equals(Event.TAB_GAME)){
-            subType = AppStatisticsConfig.SubType.tab_game;
+            subType = AppStatisticsConfig.ClickSubType.tab_game;
         }else if(event.equals(Event.TAB_CATEGORY)){
-            subType = AppStatisticsConfig.SubType.tab_category;
+            subType = AppStatisticsConfig.ClickSubType.tab_category;
         }else if(event.equals(Event.TAB_SHEEP)){
-            subType = AppStatisticsConfig.SubType.tab_sheep;
+            subType = AppStatisticsConfig.ClickSubType.tab_sheep;
         }else if(event.equals(Event.TAB_JIEZHEWAN)){
-            subType = AppStatisticsConfig.SubType.tab_jiezhewan;
+            subType = AppStatisticsConfig.ClickSubType.tab_jiezhewan;
         }else if(event.equals(Event.TAB_CREDITCARD)){
-            subType = AppStatisticsConfig.SubType.tab_creditcard;
+            subType = AppStatisticsConfig.ClickSubType.tab_creditcard;
         }else if(event.equals(Event.SHEEP_TASK_TRY)){
-            subType = AppStatisticsConfig.SubType.sheep_task_try;
+            subType = AppStatisticsConfig.ClickSubType.sheep_task_try;
         }else if(event.equals(Event.SHEEP_TASK_INVITE)){
-            subType = AppStatisticsConfig.SubType.sheep_task_invite;
+            subType = AppStatisticsConfig.ClickSubType.sheep_task_invite;
         }else if(event.equals(Event.SHEEP_TASK_LIE)){
-            subType = AppStatisticsConfig.SubType.sheep_task_lie;
+            subType = AppStatisticsConfig.ClickSubType.sheep_task_lie;
         }else if(event.equals(Event.SHEEP_TIXIAN)){
-            subType = AppStatisticsConfig.SubType.sheep_tixian;
+            subType = AppStatisticsConfig.ClickSubType.sheep_tixian;
         }else if(event.equals(Event.TASK_DETAIL)){
-            subType = AppStatisticsConfig.SubType.task_detail;
+            subType = AppStatisticsConfig.ClickSubType.task_detail;
         }else if(event.equals(Event.TASK_DOWNLOAD)){
-            subType = AppStatisticsConfig.SubType.task_download;
+            subType = AppStatisticsConfig.ClickSubType.task_download;
         }else if(event.equals(Event.TASK_UPLOAD_PICTURE)){
-            subType = AppStatisticsConfig.SubType.task_upload_picture;
+            subType = AppStatisticsConfig.ClickSubType.task_upload_picture;
         }else if(event.equals(Event.USER_ACCOUNT_SAFE)){
-            subType = AppStatisticsConfig.SubType.user_account_safe;
+            subType = AppStatisticsConfig.ClickSubType.user_account_safe;
         }else if(event.equals(Event.USER_TASK_RECORD)){
-            subType = AppStatisticsConfig.SubType.user_task_record;
+            subType = AppStatisticsConfig.ClickSubType.user_task_record;
         }else if(event.equals(Event.USER_TIXIAN_DETAIL)){
-            subType = AppStatisticsConfig.SubType.user_tixian_detail;
+            subType = AppStatisticsConfig.ClickSubType.user_tixian_detail;
         }else if(event.equals(Event.USER_BIND_PHONE)){
-            subType = AppStatisticsConfig.SubType.user_bind_phone;
+            subType = AppStatisticsConfig.ClickSubType.user_bind_phone;
         }else if(event.equals(Event.USER_BIND_WEIXIN)){
-            subType = AppStatisticsConfig.SubType.user_bind_weixin;
+            subType = AppStatisticsConfig.ClickSubType.user_bind_weixin;
         }else if(event.equals(Event.USER_AUTHENTICATION)){
-            subType = AppStatisticsConfig.SubType.user_authentication;
+            subType = AppStatisticsConfig.ClickSubType.user_authentication;
         }else if(event.equals(Event.USER_LOGOUT)){
-            subType = AppStatisticsConfig.SubType.user_logout;
+            subType = AppStatisticsConfig.ClickSubType.user_logout;
         }else if(event.equals(Event.GAME_SEARCH)){
-            subType = AppStatisticsConfig.SubType.game_search;
+            subType = AppStatisticsConfig.ClickSubType.game_search;
         }else if(event.equals(Event.GAME_DOWNLOAD_MANAGER)){
-            subType = AppStatisticsConfig.SubType.game_download_manager;
+            subType = AppStatisticsConfig.ClickSubType.game_download_manager;
         }else if(event.equals(Event.GAME_DOWNLOAD)){
-            subType = AppStatisticsConfig.SubType.game_download;
+            subType = AppStatisticsConfig.ClickSubType.game_download;
         }else if(event.equals(Event.TASK_ACCEPT)){
-            subType = AppStatisticsConfig.SubType.task_accept;
+            subType = AppStatisticsConfig.ClickSubType.task_accept;
         }
 
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.PType.ONCLICK_EVENT,subType,"");
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.ONCLICK_EVENT,subType,"");
 
     }
 
@@ -155,7 +155,7 @@ public class UMConfigUtils {
         MobclickAgent.onResume(context);
 
         String tag = context.getClass().getCanonicalName();
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.PType.PAGE_START,0,tag);
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_START,0,tag);
     }
 
     /**
@@ -165,7 +165,7 @@ public class UMConfigUtils {
     public static void onPageStart(String tag){
         MobclickAgent.onPageStart(tag);
 
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.PType.PAGE_START,0,tag);
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_START,0,tag);
     }
 
     /**
@@ -176,7 +176,7 @@ public class UMConfigUtils {
         MobclickAgent.onPause(context);
 
         String tag = context.getClass().getCanonicalName();
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.PType.PAGE_END,0,tag);
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_END,0,tag);
     }
 
     /**
@@ -186,14 +186,14 @@ public class UMConfigUtils {
     public static void onPageEnd(String tag){
         MobclickAgent.onPageEnd(tag);
 
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.PType.PAGE_END,0,tag);
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_END,0,tag);
     }
 
     /**
      * 任务完成时间统计
      */
     public static void finishTask(){
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.PType.TASK_FINISH,0,"");
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.TASK_FINISH,0,"");
     }