添加统计

app/src/main/AndroidManifest.xml

@@ -163,8 +163,6 @@
             android:launchMode="singleTask"/>
         <activity android:name="com.sheep.gamegroup.view.activity.HomePageAct"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.BindDataAct"
-            android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.DialogActivity"
             android:theme="@style/MyDialogActivityTheme"
             />

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

@@ -239,7 +239,7 @@ public class FgtFindChild extends BaseCompatFragment {
                                     G.showToast(R.string.error_data);
                                     return;
                                 }
-                                CommonUtil.getInstance().goWhere(activity, homeListEntity);
+                                CommonUtil.getInstance().goWhere(activity, homeListEntity, "发现");
                             }
 
                             @Override

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

@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
@@ -19,14 +18,12 @@ import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.AgentEntity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
-import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.FastJsonUtils;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -45,6 +42,13 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_AGENT;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN_SURE;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FAQ;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_SHARE;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_UPGRADE;
+
 /**
  * 个人中心
  * Created by ljy on 2018/5/8.
@@ -200,6 +204,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                     else
                         G.showToast(R.string.loading_data);
                 }
+                USER_AGENT.onEvent();
                 break;
             case R.id.faq_layout://FAQ帮助
                 Object url_config1 = ACache.get(activity).getAsObject("url_config");
@@ -210,6 +215,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                     else
                         Jump2View.getInstance().goWeb(activity, "http://smallstation.kfzs.com/h5_faq/#/faq", "FAQ帮助");
                 }
+                USER_FAQ.onEvent();
                 break;
             case R.id.reservation_layout://游戏预约
                 Jump2View.getInstance().goActReservation(activity);
@@ -218,24 +224,24 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 Jump2View.getInstance().goNewAboutUs(activity);
                 break;
             case R.id.feedbook_layout://意见反馈
-                Jump2View.getInstance()
-                        .goFeedbackAct(
-                                activity);
+                Jump2View.getInstance().goFeedbackAct(activity);
                 break;
             case R.id.recommend_friend_layout://推荐给好友
                 if (Ety != null) {
                     ViewUtil.shareLink(activity, Ety.getShare_link());
                 }
+                USER_SHARE.onEvent();
                 break;
             case R.id.version_layout://版本更新
-                SpUtils.saveIgnoreMd5(null);
                 SysAppUtil.showVersionInfo(activity, null);
+                USER_UPGRADE.onEvent();
                 break;
             case R.id.clear_layout://清除缓存
                 ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("清除缓存").setMsg("所有本地的缓存都会被清理").setBtnRightText("取消")
                 .setBtnLeftText("确定").setBtnLeftOnClickListener(new View.OnClickListener() {
                             @Override
                             public void onClick(View view) {
+                                USER_CLEAN_SURE.onEvent();
                                 SysAppUtil.clearCache(new Action1<Object>() {
                                     @Override
                                     public void call(Object o) {
@@ -245,17 +251,16 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                                 });
                             }
                         }));
+                USER_CLEAN.onEvent();
                 break;
             case R.id.change_layout://新功能介绍
                 Jump2View.getInstance().goVersionChange(activity, ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance()));
                 break;
-            case R.id.tv_submit://注销
-                CommonUtil.getInstance()
-                        .loginOut((BaseActivity) activity);
+            case R.id.tv_submit://退出登录
+                CommonUtil.getInstance().loginOut((BaseActivity) activity);
                 break;
             case R.id.order_layout://订单管理
-                Jump2View.getInstance()
-                        .goGameTaskOrderList(activity);
+                Jump2View.getInstance().goGameTaskOrderList(activity);
                 break;
         }
     }

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

@@ -433,7 +433,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 Jump2View.getInstance().goPersonnalCenterView(activity, null);
                 break;
             case R.id.recharge://充值
-                Jump2View.getInstance().goRechargeAct(activity,null);
+                Jump2View.getInstance().goRechargeAct(activity,"首页");
                 break;
         }
     }

app/src/main/java/com/kfzs/duanduan/services/DownloadTaskService.java

@@ -166,7 +166,7 @@ public class DownloadTaskService {
         if(downLoadInfo == null){
             downLoadInfo = CommonUtil.getInstance()
                     .addNewDownloadTask(taskEty.getName(), taskEty.getDownload_url(), taskEty.getPackage_name(),
-                            Build.VERSION.SDK_INT, taskEty.getIcon(), 10+"", taskEty.getGame_id(), 1);
+                            Build.VERSION.SDK_INT, taskEty.getIcon(), 10+"", taskEty.getGame_id().hashCode(), 1);
         }
         return downLoadInfo;
     }

app/src/main/java/com/sheep/gamegroup/di/components/BindDataComponent.java

@@ -1,16 +0,0 @@
-package com.sheep.gamegroup.di.components;
-
-import com.sheep.gamegroup.di.modules.BindDataModule;
-import com.sheep.gamegroup.di.scopes.UserScope;
-import com.sheep.gamegroup.view.activity.BindDataAct;
-
-import dagger.Component;
-
-/**
- * Created by ljy on 2018/3/19.
- */
-@UserScope
-@Component(modules = BindDataModule.class, dependencies = NetComponent.class)
-public interface BindDataComponent {
-    void inject(BindDataAct bindDataAct);
-}

app/src/main/java/com/sheep/gamegroup/di/modules/BindDataModule.java

@@ -1,22 +0,0 @@
-package com.sheep.gamegroup.di.modules;
-
-import com.sheep.gamegroup.presenter.BindDataContract;
-
-import dagger.Module;
-import dagger.Provides;
-
-/**
- * Created by ljy on 2018/3/19.
- */
-@Module
-public class BindDataModule {
-    private BindDataContract.View view;
-
-    public BindDataModule(BindDataContract.View view) {
-        this.view = view;
-    }
-    @Provides
-    public BindDataContract.View provideView(){
-        return view;
-    }
-}

app/src/main/java/com/sheep/gamegroup/exception/ApiException.java

@@ -1,19 +0,0 @@
-package com.sheep.gamegroup.exception;
-
-/**
- * Created by Administrator on 2018/3/22.
- */
-
-public class ApiException  extends  Exception{
-
-
-    public int code;
-    public String message;
-
-    public ApiException(Throwable throwable, int code) {
-        super(throwable);
-        this.code = code;
-
-    }
-}
-

app/src/main/java/com/sheep/gamegroup/exception/ERROR.java

@@ -1,26 +0,0 @@
-package com.sheep.gamegroup.exception;
-
-/**
- * Created by Administrator on 2018/3/22.
- */
-
-public class ERROR {
-    /**
-     * 未知错误
-     */
-    public static final int UNKNOWN = 1000;
-    /**
-     * 解析错误
-     */
-    public static final int PARSE_ERROR = 1001;
-    /**
-     * 网络错误
-     */
-    public static final int NETWORD_ERROR = 1002;
-    /**
-     * 协议出错
-     */
-    public static final int HTTP_ERROR = 1003;
-
-
-}

app/src/main/java/com/sheep/gamegroup/exception/ExceptionEngine.java

@@ -1,75 +0,0 @@
-package com.sheep.gamegroup.exception;
-
-import com.alibaba.fastjson.JSONException;
-import com.google.gson.JsonParseException;
-
-
-
-import java.net.ConnectException;
-import java.text.ParseException;
-
-import retrofit2.adapter.rxjava.HttpException;
-
-/**
- * Created by Administrator on 2018/3/22.
- */
-
-public class ExceptionEngine {
-
-    //对应HTTP的状态码
-    private static final int UNAUTHORIZED = 401;
-    private static final int FORBIDDEN = 403;
-    private static final int NOT_FOUND = 404;
-    private static final int REQUEST_TIMEOUT = 408;
-    private static final int INTERNAL_SERVER_ERROR = 500;
-    private static final int BAD_GATEWAY = 502;
-    private static final int SERVICE_UNAVAILABLE = 503;
-    private static final int GATEWAY_TIMEOUT = 504;
-    private static final int SMS_ERROR = 422;
-
-    public static ApiException handleException(Throwable e){
-        ApiException ex;
-        if (e instanceof HttpException){             //HTTP错误
-            HttpException httpException = (HttpException) e;
-            ex = new ApiException(e, httpException.code());
-            switch(httpException.code()){
-                case UNAUTHORIZED:
-                case FORBIDDEN:
-                case NOT_FOUND:
-                case REQUEST_TIMEOUT:
-                case GATEWAY_TIMEOUT:
-                case INTERNAL_SERVER_ERROR:
-                case BAD_GATEWAY:
-                case SERVICE_UNAVAILABLE:
-                    ex.message = "网络错误";  //均视为网络错误
-                    break;
-                case  SMS_ERROR:
-                    ex.message = "验证码错误";  //均视为网络错误
-                    break;
-
-
-            }
-            return ex;
-        } else if (e instanceof ServerException){    //服务器返回的错误
-            ServerException resultException = (ServerException) e;
-            ex = new ApiException(resultException, resultException.code);
-            ex.message = resultException.message;
-            return ex;
-        } else if (e instanceof JsonParseException
-                || e instanceof JSONException
-                || e instanceof ParseException){
-            ex = new ApiException(e, ERROR.PARSE_ERROR);
-            ex.message = "解析错误";            //均视为解析错误
-            return ex;
-        }else if(e instanceof ConnectException){
-            ex = new ApiException(e, ERROR.NETWORD_ERROR);
-            ex.message = "连接失败";  //均视为网络错误
-            return ex;
-        }else {
-            ex = new ApiException(e, ERROR.UNKNOWN);
-            ex.message = "未知错误";          //未知错误
-            return ex;
-        }
-    }
-
-}

app/src/main/java/com/sheep/gamegroup/exception/ServerException.java

@@ -1,12 +0,0 @@
-package com.sheep.gamegroup.exception;
-
-/**
- * Created by Administrator on 2018/3/22.
- */
-
-public class ServerException extends RuntimeException {
-    public int code;
-    public String message;
-
-
-}

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -69,28 +69,6 @@ public interface ApiService {
      */
     @GET("app/wechat/is_open")
     Observable<BaseMessage> getWebchatIsOpen();
-    /**
-     * 绑定手机号
-     */
-    @PUT("app/user/bind_mobile/")
-    Observable<BaseMessage> bindMobile(@Query("mobile") String mobile, @Query("sec_code") String sec_code);
-    /**
-     * 绑定真实姓名
-     */
-    @PUT("app/user/bind_real_name/")
-    Observable<BaseMessage> bindRealname(@Body JSONObject object);
-//    Observable<BaseMessage> bindRealname(@Query("real_name") String real_name);
-    /**
-     * 绑定身份证号
-     */
-    @PUT("app/user/bind_id_number/")
-//    Observable<BaseMessage> bindIdNumber(@Query("id_number") String id_number);
-    Observable<BaseMessage> bindIdNumber(@Body JSONObject objec);
-    /**
-     * 绑定银行卡
-     */
-    @PUT("app/user/bind_bank_card/")
-    Observable<BaseMessage> bindBankCard(@Body JSONObject objec);
 
     /**
      * 用户提现
@@ -521,7 +499,7 @@ public interface ApiService {
      * 能用的绵羊币金额
      */
     @GET("app/game_consumption/can_user_sheep_amount")
-    Observable<BaseMessage> can_user_sheep_amount(@Query("amount") int amount, @Query("game_id") int game_id);
+    Observable<BaseMessage> can_user_sheep_amount(@Query("amount") int amount, @Query("game_id") String game_id);
     /**
      * url配置
      */

app/src/main/java/com/sheep/gamegroup/model/entity/OrienteeringDetail.java

@@ -27,7 +27,7 @@ public class OrienteeringDetail implements Serializable{
 
     private float balance;//可定向消费金额
 
-    private int game_id;
+    private String game_id;
 
     private int min_amount;//最低消费金额
 
@@ -71,10 +71,10 @@ public class OrienteeringDetail implements Serializable{
     public float getBalance(){
         return this.balance;
     }
-    public void setGame_id(int game_id){
+    public void setGame_id(String game_id){
         this.game_id = game_id;
     }
-    public int getGame_id(){
+    public String getGame_id(){
         return this.game_id;
     }
     public void setMin_amount(int min_amount){

app/src/main/java/com/sheep/gamegroup/presenter/BindDataContract.java

@@ -1,20 +0,0 @@
-package com.sheep.gamegroup.presenter;
-
-/**
- * Created by ljy on 2018/3/19.
- */
-
-public interface BindDataContract {
-
-    interface Presenter{
-        void submitData(Object o);
-        void submitDataRealname(Object o);
-        void submitDataBankcard(Object o);
-        void submitDataIdnumber(Object o);
-    }
-
-    interface View{
-        void upView(Object o);
-        void failView(Object o);
-    }
-}

app/src/main/java/com/sheep/gamegroup/presenter/BindDataPresenter.java

@@ -1,92 +0,0 @@
-package com.sheep.gamegroup.presenter;
-
-import com.alibaba.fastjson.JSONObject;
-import com.sheep.gamegroup.model.api.ApiService;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-
-import javax.inject.Inject;
-
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by ljy on 2018/3/19.
- */
-
-public class BindDataPresenter implements BindDataContract.Presenter {
-    private BindDataContract.View view;
-    private ApiService apiService;
-
-    @Inject
-    public BindDataPresenter(BindDataContract.View view, ApiService apiService) {
-        this.view = view;
-        this.apiService = apiService;
-    }
-
-    @Override
-    public void submitData(Object o) {
-
-    }
-
-    @Override
-    public void submitDataRealname(Object o) {
-
-        apiService.bindRealname((JSONObject) o)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        view.failView(baseMessage);
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        view.upView(baseMessage);
-                    }
-                });
-
-    }
-
-    @Override
-    public void submitDataBankcard(Object o) {
-
-        apiService.bindBankCard((JSONObject) o)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        view.failView(baseMessage);
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        view.upView(baseMessage);
-                    }
-                });
-
-    }
-
-    @Override
-    public void submitDataIdnumber(Object o) {
-
-        apiService.bindIdNumber((JSONObject) o)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        view.failView(baseMessage);
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        view.upView(baseMessage);
-                    }
-                });
-
-    }
-}

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

@@ -360,12 +360,12 @@ public class CommonUtil {
     /**
      * 首页，homelist 跳转 逻辑
      */
-    public void goWhere(Context context, HomeListEntity entity){
+    public void goWhere(Context context, HomeListEntity entity, String from){
         if(entity == null){
             return;
         }
         try {
-            goNative(context, entity);
+            goNative(context, entity, from);
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -373,7 +373,7 @@ public class CommonUtil {
     /**
      *
      */
-    public void goNative(Context context, HomeListEntity entity){
+    public void goNative(Context context, HomeListEntity entity, String from){
 
         switch(Integer.valueOf(entity.getJump())){
             case 1://试玩赚钱
@@ -396,7 +396,7 @@ public class CommonUtil {
                 break;
             case 6://6充值q币
 //                G.showToast("敬请期待!");
-                Jump2View.getInstance().goRechargeQAct(context,null);
+                Jump2View.getInstance().goRechargeQAct(context, from);
                 break;
             case 7://微信辅助
 //                G.showToast("敬请期待!");
@@ -1055,12 +1055,16 @@ public class CommonUtil {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         if(baseMessage.getCode() == 200) {
-                            if(action1 != null)
-                                action1.call(1);
                             ViewUtil.showMsgDialog(context, new DialogConfig().setTitle("预约成功")
                                     .setMsg(String.format(Locale.CHINA, "恭喜您获得%s元绵羊币\n注意%s准时开放下载", taskReleaseEty.getTask().getBonus(),
                                             TimeUtil.TimeStamp2Date(taskReleaseEty.getTask().getAppointment_time(), "yyyy-MM-dd\u0020HH:mm")))
-                                    .setBtnLeftText("收入钱包"));
+                                    .setBtnLeftText("收入钱包").setBtnLeftOnClickListener(new View.OnClickListener() {
+                                        @Override
+                                        public void onClick(View view) {
+                                            if(action1 != null)
+                                                action1.call(1);
+                                        }
+                                    }));
                         } else {
                             G.showToast(baseMessage);
                         }
@@ -1072,4 +1076,30 @@ public class CommonUtil {
                     }
                 });
     }
+    private void giveUpTask(final Context context, final TaskReleaseEty taskReleaseEty, final Action1<Integer> action1){
+        SheepApp.getInstance().getNetComponent().getApiService().giveUpTask(taskReleaseEty.getAccepted_task_id())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(context) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        reservationGameTask(context, taskReleaseEty, action1);
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage);
+                    }
+                });
+    }
+    public void tryGiveUpTask(final Context context, final TaskReleaseEty taskReleaseEty, final Action1<Integer> action1){
+        ViewUtil.showMsgDialog(context, new DialogConfig().setTitle("提示")
+                .setMsg("是否放弃正在运行中的任务").setBtnRightText("否")
+                .setBtnLeftText("是").setBtnLeftOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        giveUpTask(context, taskReleaseEty, action1);
+                    }
+                }));
+    }
 }

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

@@ -61,7 +61,6 @@ import com.sheep.gamegroup.view.activity.ActUserLabelList;
 import com.sheep.gamegroup.view.activity.ActWeb;
 import com.sheep.gamegroup.view.activity.ActXinwanWeb;
 import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
-import com.sheep.gamegroup.view.activity.BindDataAct;
 import com.sheep.gamegroup.view.activity.BindOrChangeWeixinAct;
 import com.sheep.gamegroup.view.activity.ChangeTelAct;
 import com.sheep.gamegroup.view.activity.ChangeWxOrTelAct;
@@ -116,7 +115,16 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECHARGE;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECHARGE_QQ;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_ABOUT_US;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_ACCOUNT_SAFE;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FEEDBACK;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FIND_APP_ORDER;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_MY_MONEY;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_NEW_VERSION;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_TASK_RECORD;
 
 /**
  * Created by ljy on 2018/3/18.
@@ -180,9 +188,9 @@ public class Jump2View {
      * @param o
      */
     public void goAccountAndSecurit(Context context, Object o){
-        UMConfigUtils.onEvent(UMConfigUtils.Event.USER_ACCOUNT_SAFE);
         Intent intent = new Intent(context, AccountAndSecurityAct.class);
         context.startActivity(intent);
+        USER_ACCOUNT_SAFE.onEvent();
     }
 
     /**
@@ -494,17 +502,6 @@ public class Jump2View {
     }
 
     /**
-     * 跳到绑定数据页面
-     * @param context
-     * @param o
-     */
-    public void goBindDataView(Context context, Object o) {
-        Intent intent = new Intent(context, BindDataAct.class);
-        intent.putExtra("stype", Integer.valueOf(o.toString()));
-        ((Activity)context).startActivityForResult(intent, 0);
-    }
-
-    /**
      * 跳出弹框页面
      * @param context
      * @param curTask
@@ -560,8 +557,8 @@ public class Jump2View {
         if(o instanceof Integer){
             intent.putExtra("task_id", (Integer) o);
         }
-        if(b instanceof Integer){
-            intent.putExtra("game_id", (Integer) b);
+        if(b instanceof String){
+            intent.putExtra("game_id", (String) b);
         }else
         if(b instanceof Boolean){
             intent.putExtra("btn_show", (Boolean) b);
@@ -575,8 +572,8 @@ public class Jump2View {
         if(o instanceof Integer){
             intent.putExtra("task_id", (Integer) o);
         }
-        if(b instanceof Integer){
-            intent.putExtra("game_id", (Integer) b);
+        if(b instanceof String){
+            intent.putExtra("game_id", (String) b);
         }else
         if(b instanceof Boolean){
             intent.putExtra("btn_show", (Boolean) b);
@@ -592,10 +589,11 @@ public class Jump2View {
      * @param o
      */
     public void goTaskList2View(Context context, TaskEty o){
-        UMConfigUtils.onEvent(UMConfigUtils.Event.USER_TASK_RECORD);
         Intent intent = new Intent(context, TaskListAct.class);
         intent.putExtra("task_entity", o);
-        context.startActivity(intent);}
+        context.startActivity(intent);
+        USER_TASK_RECORD.onEvent();
+    }
 
     /**
      * 跳到已提现的列表
@@ -640,6 +638,7 @@ public class Jump2View {
         Intent i = new Intent(context, PersionInfoAct.class);
         i.putExtra("info", o);
         context.startActivity(i);
+        USER_INFO.onEvent();
     }
 
 
@@ -832,6 +831,7 @@ public class Jump2View {
     public void goMyMoney(Context context, Object o){
         Intent intent = new Intent(context, ActMyMoney.class);
         context.startActivity(intent);
+        USER_MY_MONEY.onEvent();
     }
 
     /**
@@ -848,24 +848,26 @@ public class Jump2View {
     /**
      * 跳到充值页面
      * @param context
-     * @param o
+     * @param from
      */
-    public void goRechargeAct(Context context, Object o){
+    public void goRechargeAct(Context context, String from){
         Intent intent = new Intent(context, RechargeAct.class);
         context.startActivity(intent);
+        RECHARGE.onEvent("from", from);
     }
 
     /**
      * 跳到绵羊币充值充值页面
      * @param context
-     * @param o
+     * @param from
      */
-    public void goRechargeQAct(Context context, Object o){
+    public void goRechargeQAct(Context context, String from){
         if(!SheepApp.getInstance().isShowQB()){
-            goRechargeAct(context, o);
+            goRechargeAct(context, from);
         }else {
             Intent intent = new Intent(context, RechargeQAct.class);
             context.startActivity(intent);
+            RECHARGE_QQ.onEvent("from", from);
         }
 
     }
@@ -918,6 +920,7 @@ public class Jump2View {
     public void goFeedbackAct(Context context) {
         Intent intent = new Intent(context, FeedbackAct.class);
         context.startActivity(intent);
+        USER_FEEDBACK.onEvent();
     }
 
     /**
@@ -1210,6 +1213,7 @@ public class Jump2View {
     }
 
     public void goVersionChange(final Activity activity, String currentPkgVersionName) {
+        USER_NEW_VERSION.onEvent();
         SheepApp.getInstance().getNetComponent().getApiService().getVersionInfo(currentPkgVersionName)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -1265,6 +1269,7 @@ public class Jump2View {
     public void goNewAboutUs(Activity activity) {
         Intent intent = new Intent(activity, ActNewAboutUs.class);
         activity.startActivity(intent);
+        USER_ABOUT_US.onEvent();
     }
 
     /**
@@ -1351,6 +1356,7 @@ public class Jump2View {
         intent.putExtra("id", item.getId());
         intent.putExtra("title", item.getTitle());
         activity.startActivity(intent);
+        USER_FIND_APP_ORDER.onEvent();
     }
 
     /**
@@ -1360,7 +1366,6 @@ public class Jump2View {
     public void goActReservation(Activity activity) {
         Intent intent = new Intent(activity, ActReservation.class);
         activity.startActivity(intent);
-        USER_FIND_APP_ORDER.onEvent();
     }
 
     public void tryShare(Activity activity, String shareUrlKey, String idName, int id) {

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

@@ -59,6 +59,8 @@ import rx.functions.Action1;
 import rx.functions.Func1;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.UPGRADE_DIALOG_BT;
+
 /**
  * Created by realicing on 2018/5/29.
  * realicing@sina.com
@@ -457,7 +459,8 @@ public class SysAppUtil {
                                 }
                                 @Override
                                 public void onClick(final View view) {
-
+                                    if(view instanceof TextView)
+                                        UPGRADE_DIALOG_BT.onEvent("action", ((TextView) view).getText());
                                     if(file.exists()){//直接安装
                                         installApk(file);
                                     } else if(TextUtils.isEmpty(version.getAddress())){//地址错误
@@ -501,6 +504,8 @@ public class SysAppUtil {
                                     @Override
                                     public void onClick(View view) {
                                         SpUtils.saveIgnoreMd5(TestUtil.isSheep() ? version.getVersion_number()+"" : version.getMd5_address());
+                                        if(view instanceof TextView)
+                                            UPGRADE_DIALOG_BT.onEvent("action", ((TextView) view).getText());
                                     }
                                 });
                             }

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

@@ -27,84 +27,117 @@ 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"),//游戏下载次数 5001
-        BANNER_CLICK_HORIZONTAL              ("BannerClickHorizontal"),//轮播图 广告点击次数 5002
-        TAB_GAME                             ,//主页tab中的游戏页签 5003 注：！！！！！界面已经没有显示了！！！！！
-        TAB_CATEGORY                         , //主页tab中的分类页签 5004 注：！！！！！界面已经没有显示了！！！！！
-        TAB_SHEEP                            ,//主页tab中的小绵羊页签 5005
-        TAB_JIEZHEWAN                        ,//主页tab中的借着玩页签 5006 注：！！！！！界面已经没有显示了！！！！！
-        TAB_CREDITCARD                       ,//信用卡页签 5007 注：！！！！！界面已经没有显示了！！！！！
-        SHEEP_TASK_TRY                       ,//试玩赚钱 5008
-        SHEEP_TASK_INVITE                    ,//邀请赚钱 5009
-        SHEEP_TASK_LIE                       ,//躺着赚钱 5010
-        SHEEP_TIXIAN                         ,//提现 5011
-        TASK_DETAIL                          ,//任务详情 5012
-        TASK_DOWNLOAD                        ,//任务详情中->下载游戏 5013
-        TASK_UPLOAD_PICTURE                  ,//任务详情中->上传截图 5014
-        USER_ACCOUNT_SAFE                    ,//个人中心 -> 账号安全 5015
-        USER_TASK_RECORD                     ,//个人中心 -> 任务记录 5016
-        USER_TIXIAN_DETAIL                   ,//个人中心 -> 提现明细 5017
-        USER_BIND_PHONE                      ,//账号安全 -> 绑定手机号（确定按钮）5018
-        USER_BIND_WEIXIN                     ,//账号安全 -> 绑定微信号（立即绑定按钮） 5019
-        USER_AUTHENTICATION                  ,//账号安全 -> 实名认证（提交按钮）5020
-        USER_LOGOUT                          ,//账号安全 -> 退出登录按钮 5021
-        GAME_SEARCH                          ,//搜索界面-> 搜索按钮 5022
-        GAME_DOWNLOAD_MANAGER                ,//主界面右上角 -> 下载管理按钮 5023
-        TASK_ACCEPT                          ,//接取任务 5024
-        SHEEP_NEWBIE_TASK_LIST               ,//新手任务列表界面,(界面已经修改为对话框了) 5025
-        SHEEP_NEWBIE_TASK_UNDERSTAND_SHEEP   ,//一分钟了解小绵羊界面 5026
-        SHEEP_NEWBIE_TASK_REGIST_SUCCESS_DIALOG  ,//注册小绵羊成功对话框 5027
-        SHEEP_NEWBIE_TASK_LIST_DIALOG        ,//新手任务列表对话框 5028
-        SHEEP_NEWBIE_TASK_ADD_QQ             ,//加入官方QQ群任务 5029
-        SHEEP_CREDIT_CARD                    ,//信用卡任务列表界面 5030
-        SHEEP_CREDIT_CARD_ACCEPT_LIST        ,//信用卡任务列表界面 -> 信用卡任务接受列表 5031
-        SHEEP_CREDIT_CARD_PROGRESS_QUERY_LIST       ,//信用卡任务列表界面 ->信用卡任务进度查询列表 5032
-        SHEEP_CREDIT_CARD_DETAIL                    ,//信用卡任务列表界面 -> 信用卡任务接受列表 -> 信用卡任务详情界面 5033
-        SHEEP_CREDIT_CARD_DETAIL_WEB                ,//信用卡任务列表界面 -> 信用卡任务接受列表 -> 信用卡任务详情界面 -> 申请信用卡web界面 5034
-        SHEEP_CREDIT_CARD_PROGRESS_QUERY            ,//信用卡任务列表界面 ->信用卡任务进度查询列表 -> 信用卡任务进度查询 5035
-        TASK_START_APP            ,//打开任务应用或游戏 5036
-        TASK_INSTALL_APP            ,//安装应用 5037
-        SHEEP_START            ,//启动小绵羊 5038
-        SHEEP_RESUME            ,//小绵羊进入前台 5039
-        SHEEP_PAUSE            ,//小绵羊进入后台 5040
-        SHEEP_STOP            ,//退出小绵羊 5041
-        PUNCH            ,//点击打卡赚钱 5042
-        PUNCH_SIGN_UP            ,//点击报名 5043
-        PUNCH_PUNCH            ,//点击打卡 5044
-        PUNCH_RECORD            ,//点击战绩 5045
-        PUNCH_RANKING_LIST            ,//点击本月排行榜 5046
-        PUNCH_ACCUMULATIVE_LIST            ,//选择累计打卡 5047
-        PUNCH_CONTINUATION           ,//选择连续打卡 5048
-        SHEEP_TIXIAN_COMMIT           ,//点击 提现提交按钮 5049
-        SHEEP_SEQUENTIAL_TASK           ,//点击进入连续任务界面 5050
-        SHEEP_GAME_TASK           ,//点击进入游戏任务界面 5051
-        XIANWAN_WEBVIEW           ,//闲玩 5052
-        ORDER_MANAGER           ,//订单管理 5053
-        USER_AUTHENTICATION_ENTER           ,//进入实名认证界面 5054
-        TAB_USER           ,//点击主页tab中的个人中心模块 5055
-        TAB_FIND           ,//点击主页tab中的发现模块 5056
-        FIND_TAG           ,//点击发现模块上面的标签 5057 需要传标签id到substring中，如：{"find_tag_name": "全部}
-        FIND_ITEM           ,//点击发现模块中列表里面的一个单项 5058 需要传发现项的id到substring中，如：{"find_id": 1}
-        FIND_APP           ,//点击下载或者预约、取消预约等 发现模块中的一个游戏或者应用 5059 需要传发现App的id和操作到substring中，如：{"application_id": 1, "action", "开始下载"}
-        FIND_SHARE           ,//点击发现详情中的分享 5060 需要传发现项的id或者application_id到substring中，如：{"find_id": 1}或{"application_id": 1}
-        FIND_TASK           ,//领取任务或者取消任务 5061 需要传任务的id和操作到substring中，如：{"release_task_id":1,"action":"领取任务"}或{"release_task_id":1,"action":"取消任务"}
-        FIND_SCORE           ,//评分或者重新评分 5062 需要传发现app的id到substring中，如：{"application_id": 1}
-        USER_FIND_APP_ORDER           ,//点击个人中心中的游戏预约 5063
-        MY_MONEY_TAB           ,//点击我的资产中的tab 5064 需要传点击的tab对应的名字：充值记录、提现记录、收支明细，如:{"tab_name": "充值记录"}或{"tab_name": "提现记录"}或{"tab_name": "收支明细"}
-        NEWBIE_TASK           ,//点击新手任务图标 5065
-        AD_SPLASH           ,//点击开屏广告 5066 需要传点击的广告对应的id，如:{"ad_id": 1}
-        AD_TOAST           ,//点击弹窗广告 5067 需要传点击的广告对应的id，如:{"ad_id": 1}
-        LOGIN_PHONE         ,//点击登录界面中的手机号登录 5068
-        LOGIN_QQ        ,//点击登录界面中的QQ登录 5069
-        LOGIN_WX        ,//点击登录界面中的微信登录 5070
+    public enum Event {
+        GAME_DOWNLOAD("GameDownload"),//游戏下载次数 5001
+        BANNER_CLICK_HORIZONTAL("BannerClickHorizontal"),//轮播图 广告点击次数 5002
+        TAB_GAME,//主页tab中的游戏页签 5003 注：！！！！！界面已经没有显示了！！！！！
+        TAB_CATEGORY, //主页tab中的分类页签 5004 注：！！！！！界面已经没有显示了！！！！！
+        TAB_SHEEP,//主页tab中的小绵羊页签 5005
+        TAB_JIEZHEWAN,//主页tab中的借着玩页签 5006 注：！！！！！界面已经没有显示了！！！！！
+        TAB_CREDITCARD,//信用卡页签 5007 注：！！！！！界面已经没有显示了！！！！！
+        SHEEP_TASK_TRY,//试玩赚钱 5008
+        SHEEP_TASK_INVITE,//邀请赚钱 5009
+        SHEEP_TASK_LIE,//躺着赚钱 5010
+        SHEEP_TIXIAN,//提现 5011
+        TASK_DETAIL,//任务详情 5012
+        TASK_DOWNLOAD,//任务详情中->下载游戏 5013
+        TASK_UPLOAD_PICTURE,//任务详情中->上传截图 5014
+        USER_ACCOUNT_SAFE,//个人中心 -> 账号安全 5015
+        USER_TASK_RECORD,//个人中心 -> 任务记录 5016
+        USER_TIXIAN_DETAIL,//个人中心 -> 提现明细 5017
+        USER_BIND_PHONE,//账号安全 -> 绑定手机号（确定按钮）5018
+        USER_BIND_WEIXIN,//账号安全 -> 绑定微信号（立即绑定按钮） 5019
+        USER_AUTHENTICATION,//账号安全 -> 实名认证（提交按钮）5020
+        USER_LOGOUT,//账号安全 -> 退出登录按钮 5021
+        GAME_SEARCH,//搜索界面-> 搜索按钮 5022
+        GAME_DOWNLOAD_MANAGER,//主界面右上角 -> 下载管理按钮 5023
+        TASK_ACCEPT,//接取任务 5024
+        SHEEP_NEWBIE_TASK_LIST,//新手任务列表界面,(界面已经修改为对话框了) 5025
+        SHEEP_NEWBIE_TASK_UNDERSTAND_SHEEP,//一分钟了解小绵羊界面 5026
+        SHEEP_NEWBIE_TASK_REGIST_SUCCESS_DIALOG,//注册小绵羊成功对话框 5027
+        SHEEP_NEWBIE_TASK_LIST_DIALOG,//新手任务列表对话框 5028
+        SHEEP_NEWBIE_TASK_ADD_QQ,//加入官方QQ群任务 5029
+        SHEEP_CREDIT_CARD,//信用卡任务列表界面 5030
+        SHEEP_CREDIT_CARD_ACCEPT_LIST,//信用卡任务列表界面 -> 信用卡任务接受列表 5031
+        SHEEP_CREDIT_CARD_PROGRESS_QUERY_LIST,//信用卡任务列表界面 ->信用卡任务进度查询列表 5032
+        SHEEP_CREDIT_CARD_DETAIL,//信用卡任务列表界面 -> 信用卡任务接受列表 -> 信用卡任务详情界面 5033
+        SHEEP_CREDIT_CARD_DETAIL_WEB,//信用卡任务列表界面 -> 信用卡任务接受列表 -> 信用卡任务详情界面 -> 申请信用卡web界面 5034
+        SHEEP_CREDIT_CARD_PROGRESS_QUERY,//信用卡任务列表界面 ->信用卡任务进度查询列表 -> 信用卡任务进度查询 5035
+        TASK_START_APP,//打开任务应用或游戏 5036
+        TASK_INSTALL_APP,//安装应用 5037
+        SHEEP_START,//启动小绵羊 5038
+        SHEEP_RESUME,//小绵羊进入前台 5039
+        SHEEP_PAUSE,//小绵羊进入后台 5040
+        SHEEP_STOP,//退出小绵羊 5041
+        PUNCH,//点击打卡赚钱 5042
+        PUNCH_SIGN_UP,//点击报名 5043
+        PUNCH_PUNCH,//点击打卡 5044
+        PUNCH_RECORD,//点击战绩 5045
+        PUNCH_RANKING_LIST,//点击本月排行榜 5046
+        PUNCH_ACCUMULATIVE_LIST,//选择累计打卡 5047
+        PUNCH_CONTINUATION,//选择连续打卡 5048
+        SHEEP_TIXIAN_COMMIT,//点击 提现提交按钮 5049
+        SHEEP_SEQUENTIAL_TASK,//点击进入连续任务界面 5050
+        SHEEP_GAME_TASK,//点击进入游戏任务界面 5051
+        XIANWAN_WEBVIEW,//闲玩 5052
+        ORDER_MANAGER,//订单管理 5053
+        USER_AUTHENTICATION_ENTER,//进入实名认证界面 5054
+        TAB_USER,//点击主页tab中的个人中心模块 5055
+        TAB_FIND,//点击主页tab中的发现模块 5056
+        FIND_TAG,//点击发现模块上面的标签 5057 需要传标签id到substring中，如：{"find_tag_name": "全部}
+        FIND_ITEM,//点击发现模块中列表里面的一个单项 5058 需要传发现项的id到substring中，如：{"find_id": 1}
+        FIND_APP,//点击下载或者预约、取消预约等 发现模块中的一个游戏或者应用 5059 需要传发现App的id和操作到substring中，如：{"application_id": 1, "action", "开始下载"}
+        FIND_SHARE,//点击发现详情中的分享 5060 需要传发现项的id或者application_id到substring中，如：{"find_id": 1}或{"application_id": 1}
+        FIND_TASK,//领取任务或者取消任务 5061 需要传任务的id和操作到substring中，如：{"release_task_id":1,"action":"领取任务"}或{"release_task_id":1,"action":"取消任务"}
+        FIND_SCORE,//评分或者重新评分 5062 需要传发现app的id到substring中，如：{"application_id": 1}
+        USER_FIND_APP_ORDER,//点击个人中心中的游戏预约 5063
+        MY_MONEY_TAB,//点击我的资产中的tab 5064 需要传点击的tab对应的名字：充值记录、提现记录、收支明细，如:{"tab_name": "充值记录"}或{"tab_name": "提现记录"}或{"tab_name": "收支明细"}
+        NEWBIE_TASK,//点击新手任务图标 5065
+        AD_SPLASH,//点击开屏广告 5066 需要传点击的广告对应的id，如:{"ad_id": 1}
+        AD_TOAST,//点击弹窗广告 5067 需要传点击的广告对应的id，如:{"ad_id": 1}
+        LOGIN_PHONE,//点击登录界面中的手机号登录 5068
+        LOGIN_QQ,//点击登录界面中的QQ登录 5069
+        LOGIN_WX,//点击登录界面中的微信登录 5070
+        USER_INFO,//个人中心 -> 个人资料 5071
+        USER_MY_MONEY,//个人中心 -> 我的资产 5072
+        USER_AGENT,//个人中心 -> 代理 5073
+        USER_FAQ,//个人中心 -> FAQ帮助 5074
+        USER_ABOUT_US,//个人中心 -> 关于我们 5075
+        USER_FEEDBACK,//个人中心 -> 意见反馈 5076
+        USER_SHARE,//个人中心 -> 推荐给好友 5077
+        USER_UPGRADE,//个人中心 -> 版本更新 5078
+        USER_CLEAN,//个人中心 -> 清除缓存 5079
+        USER_CLEAN_SURE,//个人中心 -> 清除缓存 -> 确认 5080
+        USER_NEW_VERSION,//个人中心 -> 新功能介绍 5081
+        USER_GAME_ACCOUNT,//个人中心 -> 游戏账号 5082
+        USER_GAME_INSTEAD_OF_RECHARGE,//个人中心 -> 游戏代充 5083
+        UPGRADE_DIALOG_BT,//升级对话框 -> 立即安装、立即更新、下次更新 5084  需要传对应操作到substring中，如：{"action":"立即安装"}或者{"action":"立即更新"}或者{"action":"下次更新"}
+        RECHARGE,//充值 5085  需要传来源到substring中，如：{"from":"我的资产"}或者{"from":"首页"}或者{"from":"我的资产"}或者{"from":"内部H5"}或者{"from":"推送"}或者{"from":"充值Q币"}
+        RECHARGE_PAY,//充值 -> 立即支付 50
+        RECHARGE_QQ,//充值Q币 50  需要传来源到substring中，如：{"from":"发现"}或者{"from":"首页"}或者{"from":"推送"}
+        RECHARGE_QQ_PAY,//充值Q币 -> 立即支付 50
+        USER_INFO_AVATAR,//个人中心 -> 个人资料 -> 头像 50
+        USER_INFO_NAME,//个人中心 -> 个人资料 -> 昵称 50
+        USER_INFO_NAME_MODIFY,//个人中心 -> 个人资料 -> 昵称 -> 确认修改 50
+        QR_SHARE,//我的二维码 50
+        QR_SAVE,//保存二维码至手机 50
+        QR_COPY,//复制二维码链接 50
+        LINK_SHARE,//分享链接 50
+        BIND_WX,//绑定微信 50
+        BIND_PHONE,//绑定手机号 50
+        SHARE_TO_WX,//分享到微信 50
+        SHARE_TO_QQ,//分享到QQ 50
+        USER_FEEDBACK_COMMIT,//个人中心 -> 意见反馈 -> 提交建议 50
         ;
         private String key;
-        Event(String key){
+
+        Event(String key) {
             this.key = key;
         }
-        Event(){
+
+        Event() {
             this.key = name().toLowerCase();
         }
 
@@ -115,16 +148,20 @@ public class UMConfigUtils {
         public void setKey(String key) {
             this.key = key;
         }
-        public int getId(){
-            return ordinal()+5001;
+
+        public int getId() {
+            return ordinal() + 5001;
         }
-        public void onEvent(){
+
+        public void onEvent() {
             UMConfigUtils.onEvent(this);
         }
-        public void onEvent(Map<String, String> map){
+
+        public void onEvent(Map<String, String> map) {
             UMConfigUtils.onEvent(this, map);
         }
-        public void onEvent(Object...items){
+
+        public void onEvent(Object... items) {
             Map<String, String> map = new HashMap<>();
             for (int i = 0; i < items.length; ) {
                 map.put(items[i].toString(), items[i + 1].toString());
@@ -141,38 +178,42 @@ public class UMConfigUtils {
             }
         }
     }
+
     static {
-        if(BuildConfig.DEBUG)
+        if (BuildConfig.DEBUG)
             Event.println();
     }
 
-    public enum IdEvent{
+    public enum IdEvent {
         HOME_LIST,//id 1 首页功能列表
         BANNER(),//id 2 首页轮播图
         TASK(),//id 3   任务列表
         ;
-        private int getType(){
-            return ordinal()+1;
+
+        private int getType() {
+            return ordinal() + 1;
         }
-        synchronized public void commit(int click_id){
+
+        synchronized public void commit(int click_id) {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("click_id", click_id);
             jsonObject.put("type", getType());
             SheepApp.getInstance().getNetComponent().getApiService().commitIdEvent(jsonObject)
-                            .subscribeOn(Schedulers.io())
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                                @Override
-                                public void onNext(BaseMessage baseMessage) {
-                                }
-
-                                @Override
-                                public void onError(BaseMessage baseMessage) {
-                                }
-                            });
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                        @Override
+                        public void onNext(BaseMessage baseMessage) {
+                        }
+
+                        @Override
+                        public void onError(BaseMessage baseMessage) {
+                        }
+                    });
         }
     }
-    public static class Source{
+
+    public static class Source {
         public static final String QQ = "QQ";
         public static final String WECHAT = "wechat";
         public static final String SHEEP = "sheep";
@@ -182,56 +223,59 @@ public class UMConfigUtils {
      * 用户信息统计
      * 登录
      */
-    public static void onProfileSignIn(){
-        String source = PreferenceUtils.getPrefString(SheepApp.mContext,LOGIN_TYPE,Source.SHEEP);
-        String openid = PreferenceUtils.getPrefString(SheepApp.mContext,LOGIN_OPENID,"");
+    public static void onProfileSignIn() {
+        String source = PreferenceUtils.getPrefString(SheepApp.mContext, LOGIN_TYPE, Source.SHEEP);
+        String openid = PreferenceUtils.getPrefString(SheepApp.mContext, LOGIN_OPENID, "");
 
 //        if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
 //            MobclickAgent.onProfileSignIn(source,openid);
 
         //自己的统计信息
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.DAU,AppStatisticsConfig.DauSubType.signIn,"");
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.DAU, AppStatisticsConfig.DauSubType.signIn, "");
     }
 
     /**
      * 登出
      */
-    public static void onProfileSignOff(){
+    public static void onProfileSignOff() {
 //        if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
 //            MobclickAgent.onProfileSignOff();
 
         //自己的统计退出
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.DAU,AppStatisticsConfig.DauSubType.signOff,"");
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.DAU, AppStatisticsConfig.DauSubType.signOff, "");
     }
 
 
     /**
      * Umeng事件统计
+     *
      * @param event
      */
-    public static void onEvent(Event event){
-        LogUtil.println("SheepApp onEvent "+event.getId()+" "+event.getKey());
-        try{
+    public static void onEvent(Event event) {
+        LogUtil.println("SheepApp onEvent " + event.getId() + " " + event.getKey());
+        try {
 //            if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
 //                MobclickAgent.onEvent(SheepApp.mContext,event.getKey());
 
-            AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.ONCLICK_EVENT, event.getId(),"");
-        }catch (Exception e){
+            AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.ONCLICK_EVENT, event.getId(), "");
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
+
     /**
      * Umeng事件统计
+     *
      * @param event
      */
-    public static void onEvent(Event event, Map<String, String> map){
-        LogUtil.println("SheepApp onEvent "+event.getId()+" "+event.getKey());
-        try{
+    public static void onEvent(Event event, Map<String, String> map) {
+        LogUtil.println("SheepApp onEvent " + event.getId() + " " + event.getKey());
+        try {
 //            if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
 //                MobclickAgent.onEvent(SheepApp.mContext,event.getKey(), map);
 
             AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.ONCLICK_EVENT, event.getId(), JSON.toJSONString(map));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -239,72 +283,77 @@ public class UMConfigUtils {
 
     /**
      * 页面开始
+     *
      * @param context
      */
-    public static void onPageStart(Context context){
+    public static void onPageStart(Context context) {
 //        if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
 //            MobclickAgent.onResume(context);
 
         String tag = context.getClass().getCanonicalName();
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_START,0,tag);
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_START, 0, tag);
     }
 
     /**
      * 页面开始
+     *
      * @param tag
      */
-    public static void onPageStart(String tag){
+    public static void onPageStart(String tag) {
 //        if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
 //            MobclickAgent.onPageStart(tag);
 
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_START,0,tag);
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_START, 0, tag);
     }
 
     /**
      * 页面结束
+     *
      * @param context
      */
-    public static void onPageEnd(Context context){
+    public static void onPageEnd(Context context) {
 //        if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
 //            MobclickAgent.onPause(context);
 
         String tag = context.getClass().getCanonicalName();
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_END,0,tag);
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_END, 0, tag);
     }
 
     /**
      * 页面结束
+     *
      * @param tag
      */
-    public static void onPageEnd(String tag){
+    public static void onPageEnd(String tag) {
 //        if(SheepApp.getInstance().getConnectAddress() != null && SheepApp.getInstance().getConnectAddress().isUseUMStatistics())
 //            MobclickAgent.onPageEnd(tag);
 
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_END,0,tag);
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.PAGE_END, 0, tag);
     }
 
     /**
      * 任务完成时间统计
      */
-    public static void finishTask(){
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.TASK_FINISH,0,"");
+    public static void finishTask() {
+        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.TASK_FINISH, 0, "");
     }
 
 
     /**
      * 当Fragment对用户的可见性发生了改变的时候就会回调此方法
-     * @param isVisibleToUser true：用户能看见当前Fragment；false：用户看不见当前Fragment
+     *
+     * @param isVisibleToUser                      true：用户能看见当前Fragment；false：用户看不见当前Fragment
      * @param isHappenedInSetUserVisibleHintMethod true：本次回调发生在setUserVisibleHintMethod方法里；false：发生在onResume或onPause方法里
-     * @param tag fragment 名字
+     * @param tag                                  fragment 名字
      */
-    public static void onVisibilityChangedToUser(boolean isVisibleToUser, boolean isHappenedInSetUserVisibleHintMethod,String tag){
-        if(isVisibleToUser){
-            if(tag != null){
+    public static void onVisibilityChangedToUser(boolean isVisibleToUser, boolean isHappenedInSetUserVisibleHintMethod, String tag) {
+        if (isVisibleToUser) {
+            if (tag != null) {
                 //umeng fragment
                 UMConfigUtils.onPageStart(tag);
             }
-        }else{
-            if(tag != null){
+        } else {
+            if (tag != null) {
                 UMConfigUtils.onPageEnd(tag);
             }
         }

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

@@ -25,7 +25,6 @@ import android.widget.TextView;
 import android.widget.VideoView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.model.entity.Advertising;
 import com.sheep.gamegroup.model.entity.Container;
@@ -37,7 +36,6 @@ import com.sheep.gamegroup.view.dialog.DialogPayGame;
 import com.sheep.gamegroup.view.dialog.DialogShare;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -50,6 +48,11 @@ import java.util.Map;
 
 import rx.functions.Action1;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.AD_TOAST;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_COPY;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_SAVE;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_SHARE;
+
 /**
  * Created by realicing on 2018/5/11.
  * realicing@sina.com
@@ -66,6 +69,7 @@ public class ViewUtil {
     }
 
     public static void showQR(final Activity activity, String link) {
+        QR_SHARE.onEvent();
         View dialog_parent = View.inflate(activity, R.layout.dialog_parent, null);
         final AlertDialog dialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
                 .setView(dialog_parent)
@@ -104,7 +108,7 @@ public class ViewUtil {
         save_pic.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-
+                QR_SAVE.onEvent();
                 File file = ViewUtil.saveImage((View) iv_qr.getParent(), ClassFileHelper.DIR, System.currentTimeMillis() + ".jpg");
                 if (file != null) {
                     Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
@@ -164,6 +168,7 @@ public class ViewUtil {
         withdrawal.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                QR_COPY.onEvent();
                 StringUtils.CopyText(activity, link);
                 G.showToast("复制链接成功");
             }
@@ -172,7 +177,7 @@ public class ViewUtil {
         save_pic.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                QR_SAVE.onEvent();
                 File file = ViewUtil.saveImage((View) iv_qr.getParent(), ClassFileHelper.DIR, System.currentTimeMillis() + ".jpg");
                 if (file != null) {
                     Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
@@ -566,6 +571,7 @@ public class ViewUtil {
                 @Override
                 public void onClick(View view) {
                     SplashAct.goAdLink(activity, advertising);
+                    AD_TOAST.onEvent("ad_id", advertising.getId());
                     dialog.dismiss();
                 }
             });
@@ -598,10 +604,10 @@ public class ViewUtil {
     /**
      * game 充值
      */
-    public static void showGamePayAccount(Activity activity,int gameId){
+    public static void showGamePayAccount(Activity activity,String gameId){
         new DialogPayAccount(activity,gameId).showPayaccount();
     }
-    public static void showGamePay(Activity activity, String game_account_etStr, String game_pay_etStr,int gameId){
+    public static void showGamePay(Activity activity, String game_account_etStr, String game_pay_etStr,String gameId){
         new DialogPayGame(activity, game_account_etStr, game_pay_etStr,gameId).showPayGame();
     }
 

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

@@ -109,7 +109,7 @@ public class WebviewJs {
     }
     @JavascriptInterface
     public void gotoRecharge() {
-        Jump2View.getInstance().goRechargeAct(activity, null);//进入充值绵羊币界面
+        Jump2View.getInstance().goRechargeAct(activity, "内部H5");//进入充值绵羊币界面
     }
 
     @JavascriptInterface

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

@@ -38,6 +38,10 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.OnClick;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.BIND_PHONE;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.BIND_WX;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO;
+
 /**
  * Created by Administrator on 2018/3/16.
  */
@@ -152,6 +156,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
         switch (view.getId()) {
             case R.id.rl_phone:   //跳转到绑定手机号
                 Jump2View.getInstance().goBindPhone(activity, null);
+                BIND_PHONE.onEvent();
                 break;
             case R.id.rl_wx:  ////跳转到微信
                 if(mEntity == null){
@@ -161,6 +166,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                 } else {
                     G.showToast("您已经绑定微信");
                 }
+                BIND_WX.onEvent();
                 break;
             case R.id.rl_auther: ////跳转授权
                 Jump2View.getInstance().goRealNameAuther(AccountAndSecurityAct.this,mEntity, 0);

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

@@ -140,7 +140,7 @@ public class ActMyMoney extends BaseActivity {
                 Jump2View.getInstance().tryGoWithdrawal(ActMyMoney.this, null);
                 break;
             case R.id.my_money_recharge_tv://充值
-                Jump2View.getInstance().goRechargeAct(ActMyMoney.this, null);
+                Jump2View.getInstance().goRechargeAct(ActMyMoney.this, "我的资产");
                 break;
             case R.id.my_money_dingxiang_amount_iv://定向货币详情
                 ViewUtil.showOrienteeringDetails(ActMyMoney.this);

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

@@ -340,7 +340,7 @@ public class ActWeb extends BaseCompatActivity {
         }
         @JavascriptInterface
         public void gotoRecharge() {
-            Jump2View.getInstance().goRechargeAct(ActWeb.this, null);//进入充值绵羊币界面
+            Jump2View.getInstance().goRechargeAct(ActWeb.this, "内部H5");//进入充值绵羊币界面
         }
 
         @JavascriptInterface

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

@@ -35,6 +35,11 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.OnClick;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.LINK_SHARE;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_COPY;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_QQ;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_WX;
+
 /**
  * Created by Administrator on 2018/3/19.
  */
@@ -122,11 +127,13 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
 
 
     private void shareToLink() {
+        LINK_SHARE.onEvent();
         ViewUtil.showMsgDialog(this, new DialogConfig().setTitle("分享链接").setMsg(mEntity.getShare_link())
             .setMsgMore("通过连接加入小绵羊即可成为你的好友").setMsgMoreColor(R.color.txt_black_9e9c9c)
             .setBtnLeftText("复制链接").setBtnLeftOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
+                            QR_COPY.onEvent();
                             StringUtils.CopyText(AskGetMoneyAct.this,mEntity.getShare_link());
                             G.showToast("复制链接成功");
                         }
@@ -189,9 +196,11 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
             switch (view.getId()) {
                 case R.id.rl_wx:
                     shareToWX();
+                    SHARE_TO_WX.onEvent();
                     break;
                 case R.id.rl_qq:
                     shareToQQ();
+                    SHARE_TO_QQ.onEvent();
                     break;
                 case R.id.rl_qr:
                     ViewUtil.showQR(AskGetMoneyAct.this, mEntity.getShare_link());

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

@@ -1,160 +0,0 @@
-package com.sheep.gamegroup.view.activity;
-
-import android.app.Activity;
-import android.support.v7.widget.AppCompatEditText;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.alibaba.fastjson.JSONObject;
-import com.sheep.gamegroup.di.components.DaggerBindDataComponent;
-import com.sheep.gamegroup.di.modules.BindDataModule;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.presenter.BindDataContract;
-import com.sheep.gamegroup.presenter.BindDataPresenter;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.jiuyan.samllsheep.utils.G;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-
-/**
- * 绑定数据
- * Created by ljy on 2018/3/19.
- */
-
-public class BindDataAct extends BaseActivity implements BindDataContract.View {
-    @BindView(R.id.text_notice_tv)
-    TextView textNoticeTv;
-    @BindView(R.id.text_et)
-    AppCompatEditText textEt;
-    @BindView(R.id.text_layout)
-    LinearLayout textLayout;
-    @BindView(R.id.number_notice_tv)
-    TextView numberNoticeTv;
-    @BindView(R.id.number_et)
-    AppCompatEditText numberEt;
-    @BindView(R.id.number_layout)
-    LinearLayout numberLayout;
-    @BindView(R.id.sure_text)
-    TextView sureText;
-    @Inject
-    BindDataPresenter presenter;
-    @BindView(R.id.img_baseactivity_title)
-    ImageView imgBaseactivityTitle;
-    @BindView(R.id.txt_baseactivity_title)
-    TextView txtBaseactivityTitle;
-    private Activity activity;
-
-    private int type = 0;
-    private String key = "real_name";
-    private String value = "";
-    private String title = "绑定真实姓名";
-
-    @Override
-    public void upView(Object o) {
-        hideProgress();
-        G.showToast("绑定成功");
-        finish();
-
-    }
-
-    @Override
-    public void failView(Object o) {
-        G.showToast(((BaseMessage)o).getMsg()+"");
-        hideProgress();
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.bind_data_act_layout;
-    }
-
-    @Override
-    public void initView() {
-        activity = this;
-        DaggerBindDataComponent.builder()
-                .netComponent(SheepApp.get(this).getNetComponent())
-                .bindDataModule(new BindDataModule(this))
-                .build()
-                .inject(this);
-        type = getIntent().getIntExtra("stype", 0);
-        assemblyData(type);
-        txtBaseactivityTitle.setText(title);
-    }
-
-    @Override
-    public void initListener() {
-
-    }
-
-    @Override
-    public void initData() {
-    }
-
-    @OnClick({R.id.sure_text, R.id.img_baseactivity_title})
-    public void onViewClicked(View view) {
-        switch (view.getId()) {
-            case R.id.sure_text:
-                assemblyData(type);
-                submit();
-                break;
-            case R.id.img_baseactivity_title:
-                finish();
-                break;
-        }
-    }
-
-    private void submit() {
-        if(android.text.TextUtils.isEmpty(value)){
-            G.showToast("请填入数据");
-            return;
-        }
-        JSONObject j = new JSONObject();
-        j.put(key, value);
-        showProgress();
-        switch (type) {
-            case 40001:
-                presenter.submitDataRealname(j);
-                break;
-            case 40002:
-                presenter.submitDataIdnumber(j);
-                break;
-            case 40003:
-                presenter.submitDataBankcard(j);
-                break;
-        }
-    }
-
-    private String assemblyData(int type){
-        switch (type) {
-            case 40001:
-                key = "real_name";
-                title = "绑定真实姓名";
-                numberLayout.setVisibility(View.GONE);
-                textNoticeTv.setText("真实姓名");
-                value = textEt.getText().toString();
-                break;
-            case 40002:
-                key = "id_number";
-                title = "绑定身份证";
-                numberLayout.setVisibility(View.GONE);
-                textNoticeTv.setVisibility(View.GONE);
-                value = textEt.getText().toString();
-                break;
-            case 40003:
-                key = "bank_card";
-                title = "绑定银行卡";
-                textLayout.setVisibility(View.GONE);
-                numberNoticeTv.setText("卡号");
-                value = numberEt.getText().toString();
-                break;
-        }
-        return value;
-    }
-}

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

@@ -18,6 +18,8 @@ import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FEEDBACK_COMMIT;
+
 /**
  * 意见反馈
  * Created by ljy on 2018/5/10.
@@ -64,6 +66,7 @@ public class FeedbackAct extends BaseActivity {
 
     @OnClick(R.id.tv_submit)
     public void onViewClicked() {
+        USER_FEEDBACK_COMMIT.onEvent();
         Content = feedbookEt.getText() +"";
         Email = feedbookEmailEt.getText() +"";
         if(android.text.TextUtils.isEmpty(Content)){

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

@@ -31,6 +31,10 @@ import butterknife.BindView;
 import butterknife.OnClick;
 import rx.functions.Action1;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.LOGIN_PHONE;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.LOGIN_QQ;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.LOGIN_WX;
+
 /**
  * Created by ljy on 2018/3/8.
  */
@@ -107,6 +111,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
 
     private void goTelLogin() {
+        LOGIN_PHONE.onEvent();
         String openId = SpUtils.getOpenId(getApplicationContext());
         if (!TextUtils.isEmpty(openId)) {
             Jump2View.getInstance().goHomePageView(this, null);
@@ -118,6 +123,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
     }
 
     private void goWeixin() {
+        LOGIN_WX.onEvent();
         UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
             @Override
             public void onStart(SHARE_MEDIA platform) {
@@ -154,6 +160,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
 
     private void loginQQ() {
+        LOGIN_QQ.onEvent();
         UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.QQ, new UMAuthListener() {
             @Override
             public void onStart(SHARE_MEDIA platform) {

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

@@ -119,10 +119,10 @@ public class MiddleAct extends Activity {
                             Jump2View.getInstance().goWithdrawalResultview(activity, NumberFormatUtils.parseFloat(msg.getMsg()));
                             break;
                         case 63://充值Q币
-                            Jump2View.getInstance().goRechargeQAct(activity,null);
+                            Jump2View.getInstance().goRechargeQAct(activity,"推送");
                             break;
                         case 64://充值绵羊币
-                            Jump2View.getInstance().goRechargeAct(activity,null);
+                            Jump2View.getInstance().goRechargeAct(activity,"推送");
                             break;
                         case 65://我的资产
                             Jump2View.getInstance().goMyMoney(activity,null);

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

@@ -35,6 +35,9 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_AVATAR;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_NAME;
+
 
 /**
  * Created by Administrator on 2018/3/16.
@@ -140,12 +143,14 @@ public class PersionInfoAct extends AbsChooseImageActivity {
                 Intent i = new Intent(PersionInfoAct.this, ReNameActivity.class);
                 i.putExtra("name", mEntity.getNickname());
                 startActivity(i);
+                USER_INFO_NAME.onEvent();
                 break;
             case R.id.rl_qr:
                 ViewUtil.showQR(PersionInfoAct.this, mEntity.getShare_link());
                 break;
             case R.id.rl_head:
                 showChooseDialog();
+                USER_INFO_AVATAR.onEvent();
                 break;
         }
     }

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

@@ -27,6 +27,8 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.OnClick;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_NAME_MODIFY;
+
 /**
  * Created by Administrator on 2018/3/24.
  */
@@ -124,6 +126,7 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
 
     @OnClick(R.id.tv_submit)
     public void onClick() {
+        USER_INFO_NAME_MODIFY.onEvent();
         if(android.text.TextUtils.isEmpty(et.getText().toString())){
             G.showToast("请输入昵称");
             return;

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

@@ -29,6 +29,8 @@ import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECHARGE_PAY;
+
 /**
  * Created by Administrator on 2018/3/19.
  * 充值界面
@@ -205,6 +207,7 @@ public class RechargeAct extends BaseActivity {
         switch (view.getId()) {
 
             case R.id.tv_recharge_pay:
+                RECHARGE_PAY.onEvent();
                 if (mPayType == -1) {
                     G.showToast("请选择支付方式");
                     return;

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

@@ -46,6 +46,8 @@ import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECHARGE_QQ_PAY;
+
 /**
  * Q币充值
  */
@@ -217,27 +219,27 @@ public class RechargeQAct extends BaseActivity implements RechargeQContract.View
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tv_myb_recharge:
-                Jump2View.getInstance().goRechargeAct(activity,null);
+                Jump2View.getInstance().goRechargeAct(activity, "充值Q币");
                 break;
             case R.id.rechargeq_sure:
-                if(TextUtils.isEmpty(text_QBNumber)){
+                RECHARGE_QQ_PAY.onEvent();
+                if (TextUtils.isEmpty(text_QBNumber)) {
                     text_QBNumber = etQbNumber.getText().toString().trim();
                 }
-                if(TextUtils.isEmpty(text_QBNumber)){
+                if (TextUtils.isEmpty(text_QBNumber)) {
                     G.showToast("请选择充值Q币数量");
                     return;
                 }
                 text_qq = etQq.getText().toString().trim();
-                if(TextUtils.isEmpty(text_qq)){
+                if (TextUtils.isEmpty(text_qq)) {
                     G.showToast("请输入QQ号");
                     return;
                 }
-
-         showProgress();
-         JSONObject jsonObject = new JSONObject();
-         jsonObject.put("amount", NumberFormatUtils.parseInteger(text_QBNumber));
-         jsonObject.put("qq",text_qq);
-         presenter.goRechargeQ(jsonObject);
+                showProgress();
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("amount", NumberFormatUtils.parseInteger(text_QBNumber));
+                jsonObject.put("qq", text_qq);
+                presenter.goRechargeQ(jsonObject);
                 break;
         }
     }

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

@@ -256,6 +256,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
     private UserEntity userEntity;
 
     private void trySignUp() {
+        UMConfigUtils.Event.PUNCH_PUNCH.onEvent();
         if (userEntity == null) {
             try {
                 userEntity = MyDbManager.getInstance().dbFindUser();
@@ -266,7 +267,6 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
         if (userEntity == null || TextUtils.isEmpty(userEntity.getBalance())) {
             G.showToast(R.string.unknown_error);
         } else if (NumberFormatUtils.parseFloat(userEntity.getBalance()) >= 1) {
-            UMConfigUtils.Event.PUNCH_PUNCH.onEvent();
             presenter.goSignUp();
         } else {
             ViewUtil.showMsgDialog(activity, new DialogConfig().setMsg("抱歉，你的余额不足，请先去充值再来参与打卡哦！").setBtnRightText("好的").setBtnLeftText("去充值")
@@ -280,6 +280,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
     }
 
     private void tryPunch() {
+        UMConfigUtils.Event.PUNCH_SIGN_UP.onEvent();
         switch (punchType) {//1未报名 2已打卡 3可以打卡 4已经过了时间 5活动暂未开始
             case 1:
                 ViewUtil.showMsgDialog(activity, "您昨日未报名，无法获取今日打卡资格，先去报名吧！");//未报名
@@ -289,7 +290,6 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
                 break;
             case 3:
                 presenter.goSignPunch();
-                UMConfigUtils.Event.PUNCH_SIGN_UP.onEvent();
                 break;
             case 4:
                 ViewUtil.showMsgDialog(activity, "今日打卡活动已结束，请先去报名，明日再来哦！");

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

@@ -175,7 +175,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     private TaskAcceptedEty gettaskAcceptedEty;
 
     private int taskId = -1;
-    private int game_id = -1;
+    private String game_id;
     private int game_type = -1;
 
     private int type;//-1:开始任务 1：下载 2：安装 3：打开  10：打开H5，101：充值  100:领取奖励
@@ -202,7 +202,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         btn_show = getIntent().getBooleanExtra("btn_show", false);
         isFromTaskList = getIntent().getBooleanExtra("is_from_task_list", false);
         taskId = getIntent().getIntExtra("task_id", -1);
-        game_id = getIntent().getIntExtra("game_id", -1);
+        game_id = getIntent().getStringExtra("game_id");
         game_type = getIntent().getIntExtra("game_type", -1);
         LogUtil.println("TaskDetailAct", "btn_show =", btn_show, "isFromTaskList =", isFromTaskList, "taskId =", taskId, "game_id =", game_id, "game_type =", game_type);
         DaggerTaskDetailComponent.builder()
@@ -260,7 +260,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         bottom_btn_layout.setVisibility(View.VISIBLE);
         btnTaskItem.setVisibility(View.VISIBLE);
         btnUpImag.setVisibility(View.VISIBLE);
-        if (taskReleaseEty.isIs_running() || game_id > 0) {//已经领取任务
+        if (taskReleaseEty.isIs_running() || game_id != null) {//已经领取任务
             switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务
                 case 4://h5业务
                     type = 10;
@@ -577,7 +577,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     break;
                 case R.id.btn_up_imag:
                     if(game_type == 1){
-                        if(game_id > 0){
+                        if(game_id != null){
                             ViewUtil.showGamePayAccount(activity, game_id);
                             return;
                         }

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

@@ -143,13 +143,9 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
         ButterKnife.bind(this);
     }
 
-    @OnClick({R.id.detail_task_tv, R.id.web_text, R.id.ll_infos, R.id.btn_task_item, R.id.btn_up_imag})
+    @OnClick({R.id.btn_up_imag})
     public void onViewClicked(View view) {
         switch (view.getId()) {
-            case R.id.web_text:
-                break;
-            case R.id.ll_infos:
-                break;
             case R.id.btn_up_imag:
                 showChooseDialog(false, true, DEFAULT_MAX_COUNT);
                 UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_UPLOAD_PICTURE);

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

@@ -15,6 +15,7 @@ import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.kfzs.duanduan.utils.dlg.FormatAny;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerWithdrawalComponent;
 import com.sheep.gamegroup.di.modules.WithdrawalModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -31,7 +32,6 @@ import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.WithdrawalAdapter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
@@ -153,7 +153,6 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     }
 
     private void doWithdrawal() {
-//        String price1 = ((GridViewEntity)withdrawalGreidview.getSelectedItem()).getValue();
         UMConfigUtils.Event.SHEEP_TIXIAN_COMMIT.onEvent();
         if(ListUtil.hasIndex(wlLists, select)) {
             amount = wlLists.get(select).getGridViewEntity().getValue();
@@ -172,45 +171,12 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         }
     }
 
-    /**
-     * 组装 adapter 数据
-     */
-    private ArrayList<Object> assemblyData(){
-        listData.clear();
-        listData.add(new GridViewEntity(true,10+""));
-        listData.add(new GridViewEntity(false,30+""));
-        listData.add(new GridViewEntity(false,50+""));
-        listData.add(new GridViewEntity(false,100+""));
-        listData.add(new GridViewEntity(false,500+""));
-        listData.add(new GridViewEntity(false,1000+""));
-        return listData;
-    }
 
-    /**
-     *40001 //没有绑定真实姓名
-     *40002 //没有绑定真实省份证
-     *40003 //没有绑定真实银行卡
-     * @param o
-     */
     @Override
     public void failData(Object o) {
         hideProgress();
-        try {
-            BaseMessage baseMessage = (BaseMessage) o;
-            switch (baseMessage.getCode()){
-                case 40001:
-                case 40002:
-                case 40003:
-                    Jump2View.getInstance().goBindDataView(activity, baseMessage.getCode());
-                    break;
-                default:
-                    G.showToast(baseMessage.getMsg()+"");
-                    break;
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            G.showToast(" 网络错误！");
-        }
+        if(o instanceof BaseMessage)
+            G.showToast((BaseMessage) o);
     }
 
     @Override

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

@@ -83,7 +83,7 @@ public class AdpHomeListGrideview extends BaseAdapter {
             public void onClick(View v) {
                 UMConfigUtils.IdEvent.HOME_LIST.commit(entity.getId());
                 CommonUtil.getInstance()
-                        .goWhere(context, entity);
+                        .goWhere(context, entity, "首页");
             }
         });
         return convertView;

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

@@ -85,7 +85,7 @@ public class AdpHomeListListview extends BaseAdapter {
             public void onClick(View v) {
                 UMConfigUtils.IdEvent.HOME_LIST.commit(entity.getId());
                 CommonUtil.getInstance()
-                        .goWhere(context, entity);
+                        .goWhere(context, entity, "首页");
             }
         });
         return convertView;

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

@@ -25,6 +25,7 @@ import com.kfzs.duanduan.services.DownloadTaskService;
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
+import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.OrienteeringDetail;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
@@ -449,16 +450,21 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     @Override
                     public void onClick(View v) {
                         if(taskEty.isGameReservationCantDownload()) {//游戏任务中的预约任务，且不能下载情况下
-                            CommonUtil.getInstance().reservationGameTask(context, taskReleaseEty, new Action1<Integer>(){
+                            Action1<Integer> action1 = new Action1<Integer>() {
                                 @Override
                                 public void call(Integer type) {
-                                    switch (type){
+                                    switch (type) {
                                         case 1:
                                             Jump2View.getInstance().goGameMakeMoney(context, 1);
                                             break;
                                     }
                                 }
-                            });
+                            };
+                            if(taskReleaseEty.getAccepted_task_id() < 1){//没有正在进行的任务
+                                CommonUtil.getInstance().reservationGameTask(context, taskReleaseEty, action1);
+                            } else {//先取消正在进行的任务
+                                CommonUtil.getInstance().tryGiveUpTask(context, taskReleaseEty, action1);
+                            }
                             return;
                         }
                         taskEty.setRunTask(0);

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

@@ -32,9 +32,9 @@ import rx.schedulers.Schedulers;
 
 public class DialogPayAccount {
     private Activity activity;
-    private int gameId;
+    private String gameId;
 
-    public DialogPayAccount(Activity activity, int gameId) {
+    public DialogPayAccount(Activity activity, String gameId) {
         this.activity = activity;
         this.gameId = gameId;
     }
@@ -101,7 +101,7 @@ public class DialogPayAccount {
     }
 
     public void initData(){
-        SheepApp.getInstance().getNetComponent().getApiService().can_user_sheep_amount(0, 1)
+        SheepApp.getInstance().getNetComponent().getApiService().can_user_sheep_amount(0, "1")
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {

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

@@ -51,10 +51,10 @@ public class DialogPayGame {
 
     private String balance;//金额
 
-    private int gameId;
+    private String gameId;
     private AlertDialog dialog;
 
-    public DialogPayGame(Activity activity, String game_account_etStr, String game_pay_etStr,int gameId) {
+    public DialogPayGame(Activity activity, String game_account_etStr, String game_pay_etStr,String gameId) {
         this.activity = activity;
         this.game_account_etStr = game_account_etStr;
         this.game_pay_etStr = game_pay_etStr;

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

@@ -40,7 +40,7 @@
                     android:textSize="@dimen/text_size_3"
                     android:textColor="@color/gray_4"
                     android:layout_below="@+id/feedbook_notice_top_tv"
-                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
                     android:layout_marginTop="@dimen/content_padding_15"/>
 
                 <android.support.design.widget.TextInputEditText
@@ -48,7 +48,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:minHeight="@dimen/view_size_130"
-                    android:cursorVisible="true"
                     android:layout_below="@+id/feedbook_notice_end_tv"
                     android:layout_marginTop="@dimen/content_padding"
                     android:hint="@string/feedback_notice_input_advice"
@@ -75,7 +74,6 @@
                         android:id="@+id/feedbook_email_et"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:cursorVisible="false"
                         android:layout_marginStart="5dp"
                         android:hint="@string/feedback_notice_input_email_address"
                         android:gravity="top"

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

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/bg_gray">
-
-    <include
-        layout="@layout/title"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:layout_margin="@dimen/content_padding_15"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/text_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/content_padding_small"
-            android:orientation="horizontal"
-            >
-            <TextView
-                android:id="@+id/text_notice_tv"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center|center_vertical"
-                android:gravity="left"
-                android:text="持卡人"
-                style="@style/txt_style_15"
-                android:layout_marginLeft="@dimen/content_padding_10"/>
-
-            <android.support.v7.widget.AppCompatEditText
-                android:id="@+id/text_et"
-                style="@style/edt_style"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/edt_heigh_default"
-                android:layout_weight="4"
-                android:hint="请输入"
-                android:paddingLeft="@dimen/content_padding_big"
-                android:textSize="@dimen/text_size_3"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/number_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/content_padding_small"
-            android:orientation="horizontal">
-            <TextView
-                android:id="@+id/number_notice_tv"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center|center_vertical"
-                android:text="卡 号"
-                style="@style/txt_style_15"
-                android:layout_marginLeft="@dimen/content_padding_10"
-                />
-
-            <android.support.v7.widget.AppCompatEditText
-                android:id="@+id/number_et"
-                style="@style/edt_style"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/edt_heigh_default"
-                android:layout_weight="4"
-                android:hint="请输入"
-                android:inputType="number"
-                android:paddingLeft="@dimen/content_padding_big"
-                android:textSize="@dimen/text_size_3"/>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/sure_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/txt_big_btn_style"
-        android:text="确 定"/>
-
-</LinearLayout>

kfzslibrary/src/main/java/com/kfzs/libs/convert/TResponseDataFormatException.java

@@ -1,22 +0,0 @@
-package com.kfzs.libs.convert;
-
-import java.io.IOException;
-
-/**
- * 返回的数据解析json时候格式错误
- * Created by guoxin on 2018/4/4.
- */
-
-public class TResponseDataFormatException extends IOException{
-    public static final int ERROR_DATA_FORMAT_NOT_JSON = 10001;
-
-    private int errorCode;
-    public TResponseDataFormatException(int errorCode, String message) {
-        super(message);
-        this.errorCode = errorCode;
-    }
-    public int getErrorCode() {
-        return errorCode;
-    }
-
-}