添加新手任务相关数据统计；整理数据统计中点击次数的key和id

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -244,14 +244,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
-                                List<NewbieTask> taskList = new ArrayList<>();
-                                for (NewbieTask newbieTask : newbieTaskList) {
-                                    if(BinaryUtil.isInt(userEntity.getNewbie_task_status(),newbieTask.getId() - 1, 0)) {//未完成
-                                        taskList.add(newbieTask);
-                                    }
-                                }
-                                baseMessage.setData(taskList);
                                 Jump2View.getInstance().goNewbieTaskList(activity, baseMessage);
                             }
 

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

@@ -29,59 +29,6 @@ public class AppStatisticsConfig {
         public static final int signOff = 1002;
     }
 
-    /**
-     * 统计点击次数需要的子subtype
-     */
-    public static class ClickSubType{
-        //游戏下载次数
-        public static final int game_download = 5001;
-        //广告点击次数
-        public static final int banner_click_horizontal = 5002;
-        //游戏页签
-        public static final int tab_game = 5003;
-        //分类页签
-        public static final int tab_category = 5004;
-        //小绵羊页签
-        public static final int tab_sheep = 5005;
-        //借着玩页签
-        public static final int tab_jiezhewan = 5006;
-        //信用卡页签
-        public static final int tab_creditcard = 5007;
-        //试玩赚钱
-        public static final int sheep_task_try = 5008;
-        //邀请赚钱
-        public static final int sheep_task_invite = 5009;
-        //躺着赚钱
-        public static final int sheep_task_lie = 5010;
-        //提现
-        public static final int sheep_tixian = 5011;
-        //任务详情
-        public static final int task_detail = 5012;
-        //任务详情中->下载游戏
-        public static final int task_download = 5013;
-        //任务详情中->上传截图
-        public static final int task_upload_picture = 5014;
-        //个人中心 -> 账号安全
-        public static final int user_account_safe = 5015;
-        //个人中心 -> 任务记录
-        public static final int user_task_record = 5016;
-        //个人中心 -> 提现明细
-        public static final int user_tixian_detail = 5017;
-        //账号安全 -> 绑定手机号（确定按钮）
-        public static final int user_bind_phone = 5018;
-        //账号安全 -> 绑定微信号（立即绑定按钮）
-        public static final int user_bind_weixin = 5019;
-        //账号安全 -> 实名认证（提交按钮）
-        public static final int user_authentication = 5020;
-        //账号安全 -> 退出登录按钮
-        public static final int user_logout = 5021;
-        //搜索界面-> 搜索按钮
-        public static final int game_search = 5022;
-        //主界面右上角 -> 下载管理按钮
-        public static final int game_download_manager = 5023;
-        //接取任务
-        public static final int task_accept = 5024;
-    }
 
 
 }

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

@@ -5,11 +5,16 @@ package com.sheep.gamegroup.util;
  * realicing@sina.com
  */
 public class BinaryUtil {
-    public static boolean isInt(int number, int wei, int thsInt){
-        String binaryString = Integer.toBinaryString(number);
-        if(binaryString.length() > wei){
-            return Integer.parseInt(binaryString.substring(wei, wei+1)) == thsInt;
-        }
-        return 0 == thsInt;
+    public static boolean isInt(int num, int index, int thsInt) {
+        return get(num, index) == thsInt;
     }
+
+    /**
+     * @param num:要获取二进制值的数
+     * @param index:倒数第一位为0，依次类推
+     */
+    public static int get(int num, int index) {
+        return (num & (0x1 << index)) >> index;
+    }
+
 }

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

@@ -427,6 +427,7 @@ public class Jump2View {
      * 跳转到 一分钟快速了解小绵羊 界面
      */
     public void goUnderstandSheep(Context context, Object o){
+        UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_UNDERSTAND_SHEEP);
         Intent intent = new Intent(context, ActUnderstandSheep.class);
         context.startActivity(intent);
     }
@@ -435,6 +436,7 @@ public class Jump2View {
      * 跳转到 一分钟快速了解小绵羊 界面
      */
     public void goNewbieTaskList(Context context, BaseMessage baseMessage){
+        UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_LIST);
         Intent intent = new Intent(context, ActNewbieTaskList.class);
         intent.putExtra(BaseMessage.class.getSimpleName(), baseMessage);
         context.startActivity(intent);

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

@@ -18,37 +18,51 @@ public class UMConfigUtils {
 
     public static final String LOGIN_TYPE = "sheep_login_type";
     public static final String LOGIN_OPENID = "sheep_login_openid";
+    //统计点击次数需要的子subtype
+    public enum  Event{
+        GAME_DOWNLOAD                        ("GameDownload"),//游戏下载次数
+        BANNER_CLICK_HORIZONTAL              ("BannerClickHorizontal"),//广告点击次数
+        TAB_GAME                             ("tab_game"),//游戏页签
+        TAB_CATEGORY                         ("tab_category"), //分类页签
+        TAB_SHEEP                            ("tab_sheep"),//小绵羊页签
+        TAB_JIEZHEWAN                        ("tab_jiezhewan"),//借着玩页签
+        TAB_CREDITCARD                       ("tab_creditcard"),//信用卡页签
+        SHEEP_TASK_TRY                       ("sheep_task_try"),//试玩赚钱
+        SHEEP_TASK_INVITE                    ("sheep_task_invite"),//邀请赚钱
+        SHEEP_TASK_LIE                       ("sheep_task_lie"),//躺着赚钱
+        SHEEP_TIXIAN                         ("sheep_tixian"),//提现
+        TASK_DETAIL                          ("task_detail"),//任务详情
+        TASK_DOWNLOAD                        ("task_download"),//任务详情中->下载游戏
+        TASK_UPLOAD_PICTURE                  ("task_upload_picture"),//任务详情中->上传截图
+        USER_ACCOUNT_SAFE                    ("user_account_safe"),//个人中心 -> 账号安全
+        USER_TASK_RECORD                     ("user_task_record"),//个人中心 -> 任务记录
+        USER_TIXIAN_DETAIL                   ("user_tixian_detail"),//个人中心 -> 提现明细
+        USER_BIND_PHONE                      ("user_bind_phone"),//账号安全 -> 绑定手机号（确定按钮）
+        USER_BIND_WEIXIN                     ("user_bind_weixin"),//账号安全 -> 绑定微信号（立即绑定按钮）
+        USER_AUTHENTICATION                  ("user_authentication"),//账号安全 -> 实名认证（提交按钮）
+        USER_LOGOUT                          ("user_logout"),//账号安全 -> 退出登录按钮
+        GAME_SEARCH                          ("game_search"),//搜索界面-> 搜索按钮
+        GAME_DOWNLOAD_MANAGER                ("game_download_manager"),//主界面右上角 -> 下载管理按钮
+        TASK_ACCEPT                          ("task_accept"),//接取任务
+        SHEEP_NEWBIE_TASK_LIST               ("sheep_newbie_task_list"),//新手任务列表界面
+        SHEEP_NEWBIE_TASK_UNDERSTAND_SHEEP   ("sheep_newbie_task_understand_sheep"),//一分钟了解小绵羊界面
+        SHEEP_NEWBIE_TASK_REGIST_SUCCESS_DIALOG  ("sheep_newbie_task_regist_success_dialog"),//注册小绵羊成功对话框
+        SHEEP_NEWBIE_TASK_LIST_DIALOG        ("sheep_newbie_task_list_dialog");//新手任务列表对话框
+        private String key;
+        Event(String key){
+            this.key = key;
+        }
 
-    public static class Event{
-        //下载点击事件
-        public static final String GAME_DOWNLOAD                        = "GameDownload";
-        //广告点击事件
-        public static final String BANNER_CLICK_HORIZONTAL              = "BannerClickHorizontal";
-        //
-        public static final String TAB_GAME                             = "tab_game";
-        public static final String TAB_CATEGORY                         = "tab_category";
-        public static final String TAB_SHEEP                            = "tab_sheep";
-        public static final String TAB_JIEZHEWAN                        = "tab_jiezhewan";
-        public static final String TAB_CREDITCARD                       = "tab_creditcard";
-        public static final String SHEEP_TASK_TRY                       = "sheep_task_try";
-        public static final String SHEEP_TASK_INVITE                    = "sheep_task_invite";
-        public static final String SHEEP_TASK_LIE                       = "sheep_task_lie";
-        public static final String SHEEP_TIXIAN                         = "sheep_tixian";
-        public static final String TASK_DETAIL                          = "task_detail";
-        public static final String TASK_DOWNLOAD                        = "task_download";
-        public static final String TASK_UPLOAD_PICTURE                  = "task_upload_picture";
-        public static final String USER_ACCOUNT_SAFE                    = "user_account_safe";
-        public static final String USER_TASK_RECORD                     = "user_task_record";
-        public static final String USER_TIXIAN_DETAIL                   = "user_tixian_detail";
-        public static final String USER_BIND_PHONE                      = "user_bind_phone";
-        public static final String USER_BIND_WEIXIN                     = "user_bind_weixin";
-        public static final String USER_AUTHENTICATION                  = "user_authentication";
-        public static final String USER_LOGOUT                          = "user_logout";
-        public static final String GAME_SEARCH                          = "game_search";
-        public static final String GAME_DOWNLOAD_MANAGER                = "game_download_manager";
-        public static final String TASK_ACCEPT                          = "task_accept";
-
+        public String getKey() {
+            return key;
+        }
 
+        public void setKey(String key) {
+            this.key = key;
+        }
+        public int getId(){
+            return ordinal()+5001;
+        }
     }
 
     public static class Source{
@@ -86,63 +100,10 @@ public class UMConfigUtils {
      * Umeng事件统计
      * @param event
      */
-    public static void onEvent(String event){
-        MobclickAgent.onEvent(SheepApp.mContext,event);
-        //本服数据统计
-        int subType = 0;
-        if(event.equals(Event.GAME_DOWNLOAD)){
-            subType = AppStatisticsConfig.ClickSubType.game_download;
-        }else if(event.equals(Event.BANNER_CLICK_HORIZONTAL)){
-            subType = AppStatisticsConfig.ClickSubType.banner_click_horizontal;
-        }else if(event.equals(Event.TAB_GAME)){
-            subType = AppStatisticsConfig.ClickSubType.tab_game;
-        }else if(event.equals(Event.TAB_CATEGORY)){
-            subType = AppStatisticsConfig.ClickSubType.tab_category;
-        }else if(event.equals(Event.TAB_SHEEP)){
-            subType = AppStatisticsConfig.ClickSubType.tab_sheep;
-        }else if(event.equals(Event.TAB_JIEZHEWAN)){
-            subType = AppStatisticsConfig.ClickSubType.tab_jiezhewan;
-        }else if(event.equals(Event.TAB_CREDITCARD)){
-            subType = AppStatisticsConfig.ClickSubType.tab_creditcard;
-        }else if(event.equals(Event.SHEEP_TASK_TRY)){
-            subType = AppStatisticsConfig.ClickSubType.sheep_task_try;
-        }else if(event.equals(Event.SHEEP_TASK_INVITE)){
-            subType = AppStatisticsConfig.ClickSubType.sheep_task_invite;
-        }else if(event.equals(Event.SHEEP_TASK_LIE)){
-            subType = AppStatisticsConfig.ClickSubType.sheep_task_lie;
-        }else if(event.equals(Event.SHEEP_TIXIAN)){
-            subType = AppStatisticsConfig.ClickSubType.sheep_tixian;
-        }else if(event.equals(Event.TASK_DETAIL)){
-            subType = AppStatisticsConfig.ClickSubType.task_detail;
-        }else if(event.equals(Event.TASK_DOWNLOAD)){
-            subType = AppStatisticsConfig.ClickSubType.task_download;
-        }else if(event.equals(Event.TASK_UPLOAD_PICTURE)){
-            subType = AppStatisticsConfig.ClickSubType.task_upload_picture;
-        }else if(event.equals(Event.USER_ACCOUNT_SAFE)){
-            subType = AppStatisticsConfig.ClickSubType.user_account_safe;
-        }else if(event.equals(Event.USER_TASK_RECORD)){
-            subType = AppStatisticsConfig.ClickSubType.user_task_record;
-        }else if(event.equals(Event.USER_TIXIAN_DETAIL)){
-            subType = AppStatisticsConfig.ClickSubType.user_tixian_detail;
-        }else if(event.equals(Event.USER_BIND_PHONE)){
-            subType = AppStatisticsConfig.ClickSubType.user_bind_phone;
-        }else if(event.equals(Event.USER_BIND_WEIXIN)){
-            subType = AppStatisticsConfig.ClickSubType.user_bind_weixin;
-        }else if(event.equals(Event.USER_AUTHENTICATION)){
-            subType = AppStatisticsConfig.ClickSubType.user_authentication;
-        }else if(event.equals(Event.USER_LOGOUT)){
-            subType = AppStatisticsConfig.ClickSubType.user_logout;
-        }else if(event.equals(Event.GAME_SEARCH)){
-            subType = AppStatisticsConfig.ClickSubType.game_search;
-        }else if(event.equals(Event.GAME_DOWNLOAD_MANAGER)){
-            subType = AppStatisticsConfig.ClickSubType.game_download_manager;
-        }else if(event.equals(Event.GAME_DOWNLOAD)){
-            subType = AppStatisticsConfig.ClickSubType.game_download;
-        }else if(event.equals(Event.TASK_ACCEPT)){
-            subType = AppStatisticsConfig.ClickSubType.task_accept;
-        }
+    public static void onEvent(Event event){
+        MobclickAgent.onEvent(SheepApp.mContext,event.getKey());
 
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.ONCLICK_EVENT,subType,"");
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.ONCLICK_EVENT, event.getId(),"");
 
     }
 

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

@@ -48,6 +48,20 @@ public class ActNewbieTaskList extends BaseActivity {
         swipe_container.setFooterView(this, withdrawalListview, R.layout.listview_footer);
         adp = new NewbieTaskAdp(activity, etyList);
         withdrawalListview.setAdapter(adp);
+        swipe_container.setOnRefreshListener(new RefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                etyList.clear();
+                initData();
+            }
+        });
+
+//        swipe_container.setOnLoadListener(new RefreshLayout.OnLoadListener() {
+//            @Override
+//            public void onLoad() {
+//                swipe_container.setLoading(false);
+//            }
+//        });
 
     }
 

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

@@ -8,6 +8,7 @@ import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.gamegroup.model.entity.NewbieTask;
+import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.List;
@@ -18,6 +19,7 @@ import static com.sheep.gamegroup.view.adapter.NewbieTaskAdp.doActionByTask;
 public class DialogNewbieTask1 {
 
     public static AlertDialog showDialog(final Activity activity, List<NewbieTask> newbieTaskList, NewbieTask task) {
+        UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_LIST_DIALOG);
         View view = View.inflate(activity, R.layout.dialog_newbie_task_1, null);
         final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
                 .setView(view)

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

@@ -9,12 +9,14 @@ import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 
 
 public class DialogNewbieTaskRegistSuccess {
 
     public static AlertDialog showDialog(final Activity activity) {
+        UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_REGIST_SUCCESS_DIALOG);
         View view = View.inflate(activity, R.layout.dialog_newbie_task_1, null);
         final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
                 .setView(view)