zengjiebin лет назад: 7
Родитель
Сommit
a92e5214f8

+ 2 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -179,7 +179,8 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_price_layout, R.id.account_safe_layout,
     @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_price_layout, R.id.account_safe_layout,
             R.id.account_task_layout, R.id.proxy_service_layout, R.id.abourt_us_layout, R.id.feedbook_layout,
             R.id.account_task_layout, R.id.proxy_service_layout, R.id.abourt_us_layout, R.id.feedbook_layout,
             R.id.recommend_friend_layout, R.id.tv_submit, R.id.faq_layout, R.id.reservation_layout,
             R.id.recommend_friend_layout, R.id.tv_submit, R.id.faq_layout, R.id.reservation_layout,
-            R.id.version_layout, R.id.clear_layout, R.id.change_layout, R.id.order_layout})
+            R.id.version_layout, R.id.clear_layout, R.id.change_layout, R.id.order_layout, R.id.proxy_game_account_layout
+    })
     public void onViewClicked(View view) {
     public void onViewClicked(View view) {
         switch (view.getId()) {
         switch (view.getId()) {
             case R.id.icon_img_iv://图片
             case R.id.icon_img_iv://图片

+ 4 - 9
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -2,18 +2,14 @@ package com.sheep.gamegroup.util;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Bundle;
-import android.provider.Settings;
-import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.Gravity;
 import android.view.View;
 import android.view.View;
 
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -39,7 +35,6 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.VersionInfo;
 import com.sheep.gamegroup.model.entity.VersionInfo;
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.XianWanEntity;
 import com.sheep.gamegroup.model.entity.XianWanEntity;
-import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
 import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
 import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
@@ -102,7 +97,6 @@ import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.service.FloatService;
 import com.sheep.jiuyan.samllsheep.service.FloatService;
-import com.sheep.jiuyan.samllsheep.service.MonitorAppService;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 
@@ -112,13 +106,13 @@ import org.xutils.ex.DbException;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Locale;
 import java.util.Locale;
-import java.util.Observable;
 
 
 import me.iwf.photopicker.PhotoPreview;
 import me.iwf.photopicker.PhotoPreview;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 import rx.schedulers.Schedulers;
 
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECHARGE;
 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.RECHARGE_QQ;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.SEARCH_GAME;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.SEARCH_GAME;
@@ -126,6 +120,7 @@ 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_ACCOUNT_SAFE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FEEDBACK;
 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_FIND_APP_ORDER;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO;
 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_MY_MONEY;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_NEW_VERSION;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_NEW_VERSION;
@@ -1392,7 +1387,7 @@ public class Jump2View {
     public void goGameAccount(Activity activity, Object o){
     public void goGameAccount(Activity activity, Object o){
         Intent intent = new Intent(activity, ActGameAccount.class);
         Intent intent = new Intent(activity, ActGameAccount.class);
         activity.startActivity(intent);
         activity.startActivity(intent);
-
+        USER_GAME_ACCOUNT.onEvent();
     }
     }
     /**
     /**
      * 游戏代充
      * 游戏代充
@@ -1400,7 +1395,7 @@ public class Jump2View {
     public void goGameRecharge(Activity activity, Object o){
     public void goGameRecharge(Activity activity, Object o){
         Intent intent = new Intent(activity, ActGameAgencyRecharge.class);
         Intent intent = new Intent(activity, ActGameAgencyRecharge.class);
         activity.startActivity(intent);
         activity.startActivity(intent);
-
+        GAME_INSTEAD_OF_RECHARGE.onEvent();
     }
     }
     /**
     /**
      * 游戏搜索
      * 游戏搜索

+ 1 - 2
app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -319,8 +319,7 @@ public class TestUtil {
                                 Object url_config1 = ACache.get(SheepApp.getInstance()).getAsObject("url_config");
                                 Object url_config1 = ACache.get(SheepApp.getInstance()).getAsObject("url_config");
                                 if(url_config1 instanceof JSONObject) {
                                 if(url_config1 instanceof JSONObject) {
                                     String url = ((JSONObject) url_config1).getString("agenturl");
                                     String url = ((JSONObject) url_config1).getString("agenturl");
-                                    String tokenUrl = ActWeb.addUrlToken(url);
-                                    Jump2View.getInstance().goWeb(activity, tokenUrl, "代理服务");
+                                    Jump2View.getInstance().goWeb(activity, url, "代理服务");
                                 }
                                 }
                                 break;
                                 break;
                             case "尝试开启第三方应用使用情况":
                             case "尝试开启第三方应用使用情况":

+ 6 - 1
app/src/main/java/com/sheep/gamegroup/util/UMConfigUtils.java

@@ -114,7 +114,7 @@ public class UMConfigUtils {
         USER_CLEAN_SURE("个人中心 -> 清除缓存 -> 确认"),//5080
         USER_CLEAN_SURE("个人中心 -> 清除缓存 -> 确认"),//5080
         USER_NEW_VERSION("个人中心 -> 新功能介绍"),//5081
         USER_NEW_VERSION("个人中心 -> 新功能介绍"),//5081
         USER_GAME_ACCOUNT("个人中心 -> 游戏账号"),//5082
         USER_GAME_ACCOUNT("个人中心 -> 游戏账号"),//5082
-        USER_GAME_INSTEAD_OF_RECHARGE("个人中心 -> 游戏代充"),//5083
+        GAME_INSTEAD_OF_RECHARGE("主页 -> 游戏代充"),//5083
         UPGRADE_DIALOG_BT("升级对话框 -> 立即安装、立即更新、下次更新 需要传对应操作到substring中,如:{\"action\":\"立即安装\"}或者{\"action\":\"立即更新\"}或者{\"action\":\"下次更新\"}"),//5084
         UPGRADE_DIALOG_BT("升级对话框 -> 立即安装、立即更新、下次更新 需要传对应操作到substring中,如:{\"action\":\"立即安装\"}或者{\"action\":\"立即更新\"}或者{\"action\":\"下次更新\"}"),//5084
         RECHARGE("充值 需要传来源到substring中,如:{\"from\":\"我的资产\"}或者{\"from\":\"首页\"}或者{\"from\":\"我的资产\"}或者{\"from\":\"内部H5\"}或者{\"from\":\"推送\"}或者{\"from\":\"充值Q币\"}"),//5085
         RECHARGE("充值 需要传来源到substring中,如:{\"from\":\"我的资产\"}或者{\"from\":\"首页\"}或者{\"from\":\"我的资产\"}或者{\"from\":\"内部H5\"}或者{\"from\":\"推送\"}或者{\"from\":\"充值Q币\"}"),//5085
         RECHARGE_PAY("充值 -> 立即支付"),//5086
         RECHARGE_PAY("充值 -> 立即支付"),//5086
@@ -134,6 +134,11 @@ public class UMConfigUtils {
         USER_FEEDBACK_COMMIT("个人中心 -> 意见反馈 -> 提交建议"),//5100
         USER_FEEDBACK_COMMIT("个人中心 -> 意见反馈 -> 提交建议"),//5100
         SEARCH_GAME("游戏代充模块 -> 搜索游戏"),//5101
         SEARCH_GAME("游戏代充模块 -> 搜索游戏"),//5101
         SEARCH_GAME_COMMIT("游戏代充模块 -> 搜索游戏 -> 点击搜索按钮"),//5102
         SEARCH_GAME_COMMIT("游戏代充模块 -> 搜索游戏 -> 点击搜索按钮"),//5102
+        GAME_INSTEAD_OF_RECHARGE_HELP("游戏代充模块 -> 点击帮助图标"),//5103
+        GAME_INSTEAD_OF_RECHARGE_PLATFORM("游戏代充模块 -> 点击平台充值按钮 需要传task_type和平台名称到substring中,如:{\"task_type\":1,\"name\":\"平台|小米|腾讯\"}"),//5104
+        GAME_INSTEAD_OF_RECHARGE_GAME("游戏代充模块 -> 点击游戏充值按钮"),//51
+        GAME_INSTEAD_OF_RECHARGE_PAY("游戏代充模块 -> 点击游戏充值按钮 -> 点击立即支付"),//51
+        USER_GAME_ACCOUNT_ADD("个人中心 -> 游戏账号 -> 点击添加图标"),//51
         ;
         ;
         private String tag;
         private String tag;
 
 

+ 3 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActGameAgencyRecharge.java

@@ -46,6 +46,8 @@ import butterknife.ButterKnife;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 import rx.schedulers.Schedulers;
 
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_HELP;
+
 /**
 /**
  * 游戏代充
  * 游戏代充
  * Created by ljy on 2018/7/9.
  * Created by ljy on 2018/7/9.
@@ -90,6 +92,7 @@ public class ActGameAgencyRecharge extends BaseActivity {
                         new View.OnClickListener() {//问号
                         new View.OnClickListener() {//问号
                             @Override
                             @Override
                             public void onClick(View v) {
                             public void onClick(View v) {
+                                GAME_INSTEAD_OF_RECHARGE_HELP.onEvent();
                                 ViewUtil.showMsgDialog(activity, "充值请填写正确的游戏充值账号,角色信息,其他充值问题请联系客服。","充值帮助");
                                 ViewUtil.showMsgDialog(activity, "充值请填写正确的游戏充值账号,角色信息,其他充值问题请联系客服。","充值帮助");
                             }
                             }
                         },
                         },

+ 9 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActSearchGame.java

@@ -24,6 +24,7 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
@@ -191,6 +192,9 @@ public class ActSearchGame extends BaseActivity {
 
 
             @Override
             @Override
             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+                if(search_game_input.getText().toString().startsWith("http") && TestUtil.isTest()){//测试用
+                    return;
+                }
                 search_game_input.removeCallbacks(autoSearchRunnable);
                 search_game_input.removeCallbacks(autoSearchRunnable);
                 search_game_input.postDelayed(autoSearchRunnable, 1000L);//1秒后自动搜索
                 search_game_input.postDelayed(autoSearchRunnable, 1000L);//1秒后自动搜索
             }
             }
@@ -262,6 +266,11 @@ public class ActSearchGame extends BaseActivity {
         MyDbManager.getInstance().saveOrUpdate(searchGameRecord);
         MyDbManager.getInstance().saveOrUpdate(searchGameRecord);
         searchGameRecordList.add(searchGameRecord);
         searchGameRecordList.add(searchGameRecord);
 //        inputAdapter.notifyDataSetChanged();
 //        inputAdapter.notifyDataSetChanged();
+
+        if(inputText.startsWith("http") && inputText.length() > 6 && TestUtil.isTest()){//测试用
+            Jump2View.getInstance().goWeb(activity, inputText, "测试内部H5");
+            return;
+        }
         //执行搜索
         //执行搜索
         SheepApp.getInstance().getNetComponent().getApiService()
         SheepApp.getInstance().getNetComponent().getApiService()
                 .releaseTask(1, 9,
                 .releaseTask(1, 9,

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -58,6 +58,7 @@ import javax.inject.Inject;
 import rx.functions.Action1;
 import rx.functions.Action1;
 
 
 import static com.sheep.gamegroup.model.entity.RecyleType.RUN_TASK;
 import static com.sheep.gamegroup.model.entity.RecyleType.RUN_TASK;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_PLATFORM;
 
 
 /**
 /**
  * Created by ljy on 2018/3/20.
  * Created by ljy on 2018/3/20.
@@ -409,6 +410,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 detail_task_tv.setOnClickListener(new View.OnClickListener() {
                 detail_task_tv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     @Override
                     public void onClick(View v) {
                     public void onClick(View v) {
+                        GAME_INSTEAD_OF_RECHARGE_PLATFORM.onEvent("task_type", item.getTask_type(), "name", item.getName());
                         PayEntity payEntity = new PayEntity();
                         PayEntity payEntity = new PayEntity();
                         payEntity.setTask_type(item.getTask_type()+"");
                         payEntity.setTask_type(item.getTask_type()+"");
                         ViewUtil.newInstance().showGamePay((Activity) context, payEntity);
                         ViewUtil.newInstance().showGamePay((Activity) context, payEntity);

+ 3 - 4
app/src/main/java/com/sheep/gamegroup/view/dialog/DialogPayGame.java

@@ -13,7 +13,6 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView;
 
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GamePayList;
 import com.sheep.gamegroup.model.entity.GamePayList;
@@ -24,9 +23,6 @@ import com.sheep.gamegroup.model.entity.WithdrawalList;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.gamegroup.util.MathUtil;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -44,6 +40,8 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 import rx.schedulers.Schedulers;
 
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_PAY;
+
 /**
 /**
  * Created by ljy on 2018/6/13.
  * Created by ljy on 2018/6/13.
  */
  */
@@ -275,6 +273,7 @@ public class DialogPayGame {
      是否用绵羊币 true:用 false:不用
      是否用绵羊币 true:用 false:不用
      */
      */
     private void surePay(){
     private void surePay(){
+        GAME_INSTEAD_OF_RECHARGE_PAY.onEvent();
         if(list.isEmpty()){
         if(list.isEmpty()){
             return;
             return;
         }
         }