修改红包、汽泡、提现流程

highgold/app/build.gradle

@@ -288,8 +288,6 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-    // 透明指示层
-    implementation 'me.toptas.fancyshowcase:fancyshowcaseview:1.1.5'
 
 //    implementation 'com.jaredrummler:android-processes:1.1.1'
 }

highgold/app/src/main/java/com/mints/highgold/MintsApplication.java

@@ -133,13 +133,8 @@ public class MintsApplication extends MultiDexApplication {
      * 三方配置
      */
     private void thirdConfig() {
-        //获取OAID等设备标识符
-        try {
-            MiitHelper miitHelper = new MiitHelper(appIdsUpdater);
-            miitHelper.getDeviceIds(getApplicationContext());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        //移动安装联盟 获取OAID等设备标识符
+        initMiitHelper();
 
         // 机型适配
         initRudenessScreen();
@@ -153,7 +148,7 @@ public class MintsApplication extends MultiDexApplication {
         // 猎豹游戏初始化
         LiebaoManager.getInstance().initCmGameSdk();
 
-        // 积分初始化
+        // 立言积分初始化
         initGold(this);
 
         // 初始化ShareSDK
@@ -166,7 +161,7 @@ public class MintsApplication extends MultiDexApplication {
         BindLogger();
 
         // PR下载附件
-//        initPRDownloader();
+        initPRDownloader();
 
         //穿山甲SDK初始化
         //强烈建议在应用对应的Application#onCreate()方法中调用，避免出现content为null的异常
@@ -208,6 +203,18 @@ public class MintsApplication extends MultiDexApplication {
 //        }
     }
 
+    /**
+     * 移动安装联盟 获取OAID等设备标识符
+     */
+    private void initMiitHelper() {
+        try {
+            MiitHelper miitHelper = new MiitHelper(appIdsUpdater);
+            miitHelper.getDeviceIds(getApplicationContext());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * 机型适配
      */
@@ -290,43 +297,43 @@ public class MintsApplication extends MultiDexApplication {
         JPushInterface.setDefaultPushNotificationBuilder(builder);
     }
 
-    /**
-     * 鱼丸盒子
-     */
-    public void initYwSdk() {
-        UserManager userManager = UserManager.getInstance();
-        String userID = userManager.getUserID();
-        if (!userManager.userIsLogin() || TextUtils.isEmpty(userID)) {
-            // 用户id为空 或 未登录 = 游客
-            userID = "0";
-        }
-
-        String appid = "";
-        String appSecret = "";
-        if (BuildConfig.DEBUG) {
-            appid = "1066";
-            appSecret = "nfgpxq2x1svo50m8eicv38erc9ugsx6a";
-        } else {
-            appid = "1050";
-            appSecret = "ngvbamk7h3i1psj4q4cb2vzst9ts6fml";
-        }
-
-        String oaid = "";
-        try {
-            oaid = DevicesUtil.getOaid();
-            if (oaid == null) {
-                oaid = "";
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-
-        }
-
-        System.out.println("mcg __ oaid:" + oaid);
-
-        YwSDK.Companion.init(this, appSecret, appid, userID, "1", oaid);
-    }
+//    /**
+//     * 鱼丸盒子
+//     */
+//    public void initYwSdk() {
+//        UserManager userManager = UserManager.getInstance();
+//        String userID = userManager.getUserID();
+//        if (!userManager.userIsLogin() || TextUtils.isEmpty(userID)) {
+//            // 用户id为空 或 未登录 = 游客
+//            userID = "0";
+//        }
+//
+//        String appid = "";
+//        String appSecret = "";
+//        if (BuildConfig.DEBUG) {
+//            appid = "1066";
+//            appSecret = "nfgpxq2x1svo50m8eicv38erc9ugsx6a";
+//        } else {
+//            appid = "1050";
+//            appSecret = "ngvbamk7h3i1psj4q4cb2vzst9ts6fml";
+//        }
+//
+//        String oaid = "";
+//        try {
+//            oaid = DevicesUtil.getOaid();
+//            if (oaid == null) {
+//                oaid = "";
+//            }
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//
+//        }
+//
+//        System.out.println("mcg __ oaid:" + oaid);
+//
+//        YwSDK.Companion.init(this, appSecret, appid, userID, "1", oaid);
+//    }
 
     /**
      * 百度视频

highgold/app/src/main/java/com/mints/highgold/manager/YlhAdManager.java

@@ -12,7 +12,7 @@ public class YlhAdManager {
     public static final String YLH_AD_VEDIO_APPID= "1110341375";
 
     /* vedio-postid */
-    public static final String YLH_AD_VEDIO_MAIN_PAN_POSTID = "3030498514212299";//首页大转盘
-    public static final String YLH_AD_VEDIO_VERSUS_PAN_POSTID = "6050192584710355";//挑战大转盘
-    public static final String YLH_AD_VEDIO_VERSUS_ERASE_POSTID = "7030490650012830";//挑战刮刮乐
+    public static final String YLH_AD_VEDIO_MAIN_PAN_POSTID = "5071107856089058";//首页大转盘
+    public static final String YLH_AD_VEDIO_VERSUS_PAN_POSTID = "2011506866980034";//挑战大转盘
+    public static final String YLH_AD_VEDIO_VERSUS_ERASE_POSTID = "6031208866083065";//挑战刮刮乐
 }

highgold/app/src/main/java/com/mints/highgold/mvp/model/DrawcashBean.java

+package com.mints.highgold.mvp.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class DrawcashBean implements Serializable {
+
+    /**
+     * msg : 微信账户目前正在维护中，预计3月28日前恢复，请优先用支付宝提现。
+     * realName : null
+     * wxDrawFlag : true
+     * surplus : 0
+     * openid : null
+     * lastCashOutType : WEIXIN
+     * cashOutMoneyArr : [{"money":"1","canUseOnce":true,"needFs":2,"nowFriends":0,"fsGiveCoin":800,"once":true,"canCashOut":false},{"money":"100","canUseOnce":true,"needFs":20,"nowFriends":0,"fsGiveCoin":1800,"once":true,"canCashOut":false},{"money":"150","canUseOnce":null,"needFs":30,"nowFriends":0,"fsGiveCoin":2800,"once":false,"canCashOut":false},{"money":"200","canUseOnce":null,"needFs":40,"nowFriends":0,"fsGiveCoin":3800,"once":false,"canCashOut":false},{"money":"500","canUseOnce":null,"needFs":50,"nowFriends":0,"fsGiveCoin":4800,"once":false,"canCashOut":false}]
+     * coinRate : 10000
+     * alipayAccount : null
+     * coin : 5562
+     */
+
+    private String msg;
+    private String realName;
+    private boolean wxDrawFlag;
+    private int surplus;
+    private String openid;
+    private String lastCashOutType;
+    private int coinRate;
+    private String alipayAccount;
+    private int coin;
+    private List<CashOutMoneyArrBean> cashOutMoneyArr;
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public boolean isWxDrawFlag() {
+        return wxDrawFlag;
+    }
+
+    public void setWxDrawFlag(boolean wxDrawFlag) {
+        this.wxDrawFlag = wxDrawFlag;
+    }
+
+    public int getSurplus() {
+        return surplus;
+    }
+
+    public void setSurplus(int surplus) {
+        this.surplus = surplus;
+    }
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getLastCashOutType() {
+        return lastCashOutType;
+    }
+
+    public void setLastCashOutType(String lastCashOutType) {
+        this.lastCashOutType = lastCashOutType;
+    }
+
+    public int getCoinRate() {
+        return coinRate;
+    }
+
+    public void setCoinRate(int coinRate) {
+        this.coinRate = coinRate;
+    }
+
+    public String getAlipayAccount() {
+        return alipayAccount;
+    }
+
+    public void setAlipayAccount(String alipayAccount) {
+        this.alipayAccount = alipayAccount;
+    }
+
+    public int getCoin() {
+        return coin;
+    }
+
+    public void setCoin(int coin) {
+        this.coin = coin;
+    }
+
+    public List<CashOutMoneyArrBean> getCashOutMoneyArr() {
+        return cashOutMoneyArr;
+    }
+
+    public void setCashOutMoneyArr(List<CashOutMoneyArrBean> cashOutMoneyArr) {
+        this.cashOutMoneyArr = cashOutMoneyArr;
+    }
+
+    public class CashOutMoneyArrBean implements Serializable{
+        /**
+         * money : 1
+         * canUseOnce : true
+         * needFs : 2
+         * nowFriends : 0
+         * fsGiveCoin : 800
+         * once : true
+         * canCashOut : false
+         */
+
+        private double money;
+        private boolean canUseOnce;//还有没有新人专享的机会
+        private int needFs;//需要多少朋友才能提现
+        private int nowFriends;//现在有多少了
+        private int fsGiveCoin;//朋友可以返给我多少
+        private boolean once;//是否是新人专享
+        private boolean canCashOut;//最终能不能提现
+
+        public double getMoney() {
+            return money;
+        }
+
+        public void setMoney(double money) {
+            this.money = money;
+        }
+
+        public boolean isCanUseOnce() {
+            return canUseOnce;
+        }
+
+        public void setCanUseOnce(boolean canUseOnce) {
+            this.canUseOnce = canUseOnce;
+        }
+
+        public int getNeedFs() {
+            return needFs;
+        }
+
+        public void setNeedFs(int needFs) {
+            this.needFs = needFs;
+        }
+
+        public int getNowFriends() {
+            return nowFriends;
+        }
+
+        public void setNowFriends(int nowFriends) {
+            this.nowFriends = nowFriends;
+        }
+
+        public int getFsGiveCoin() {
+            return fsGiveCoin;
+        }
+
+        public void setFsGiveCoin(int fsGiveCoin) {
+            this.fsGiveCoin = fsGiveCoin;
+        }
+
+        public boolean isOnce() {
+            return once;
+        }
+
+        public void setOnce(boolean once) {
+            this.once = once;
+        }
+
+        public boolean isCanCashOut() {
+            return canCashOut;
+        }
+
+        public void setCanCashOut(boolean canCashOut) {
+            this.canCashOut = canCashOut;
+        }
+    }
+}

highgold/app/src/main/java/com/mints/highgold/mvp/presenters/DrawcashPresenter.java

@@ -10,11 +10,13 @@ import com.mints.highgold.manager.AppHttpManager;
 import com.mints.highgold.manager.ShumeiManager;
 import com.mints.highgold.manager.UserManager;
 import com.mints.highgold.mvp.model.BaseResponse;
+import com.mints.highgold.mvp.model.DrawcashBean;
 import com.mints.highgold.mvp.model.LocationBean;
 import com.mints.highgold.mvp.model.UserBean;
 import com.mints.highgold.mvp.model.UserTaskMsgBean;
 import com.mints.highgold.mvp.views.DrawcashView;
 import com.mints.highgold.utils.DeviceUuidFactory;
+import com.mints.highgold.utils.DevicesUtil;
 import com.mints.highgold.utils.SPUtil;
 import com.mints.library.net.neterror.BaseSubscriber;
 import com.mints.library.net.neterror.Throwable;
@@ -32,7 +34,7 @@ public class DrawcashPresenter extends BasePresenter<DrawcashView> {
 
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.getDrawcashUserTaskMsg(),
-                        new BaseSubscriber<BaseResponse<UserTaskMsgBean>>() {
+                        new BaseSubscriber<BaseResponse<DrawcashBean>>() {
                             @Override
                             public void onCompleted() {
                                 if (isLinkView()) return;
@@ -49,7 +51,7 @@ public class DrawcashPresenter extends BasePresenter<DrawcashView> {
                             }
 
                             @Override
-                            public void onNext(BaseResponse<UserTaskMsgBean> baseResponse) {
+                            public void onNext(BaseResponse<DrawcashBean> baseResponse) {
                                 if (isLinkView()) return;
 
                                 int code = baseResponse.getStatus();
@@ -227,6 +229,9 @@ public class DrawcashPresenter extends BasePresenter<DrawcashView> {
         vo.put("appversion", deviceInfo.getVersionName());
         vo.put("appPkgList", deviceInfo.getPkgInfo(context));
 
+        vo.put("oaid", DevicesUtil.getOaid());
+        vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
+
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.saveTerminalInfo(vo),
                         new BaseSubscriber<BaseResponse<UserBean>>() {

highgold/app/src/main/java/com/mints/highgold/mvp/presenters/GamePresenter.java

@@ -11,11 +11,14 @@ import com.mints.highgold.manager.JpushManager;
 import com.mints.highgold.manager.ShumeiManager;
 import com.mints.highgold.manager.UserManager;
 import com.mints.highgold.mvp.model.BaseResponse;
+import com.mints.highgold.mvp.model.DrawcashBean;
 import com.mints.highgold.mvp.model.LocationBean;
+import com.mints.highgold.mvp.model.MyInfo;
 import com.mints.highgold.mvp.model.UserBean;
 import com.mints.highgold.mvp.model.UserTaskMsgBean;
 import com.mints.highgold.mvp.views.GameView;
 import com.mints.highgold.utils.DeviceUuidFactory;
+import com.mints.highgold.utils.DevicesUtil;
 import com.mints.highgold.utils.SPUtil;
 import com.mints.library.net.neterror.BaseSubscriber;
 import com.mints.library.net.neterror.Throwable;
@@ -30,8 +33,8 @@ public class GamePresenter extends BasePresenter<GameView> {
      */
     public void getUserTaskMsg() {
         AppHttpManager.getInstance(loanApplication)
-                .call(loanService.getDrawcashUserTaskMsg(),
-                        new BaseSubscriber<BaseResponse<UserTaskMsgBean>>() {
+                .call(loanService.getMyInfoMsg(),
+                        new BaseSubscriber<BaseResponse<MyInfo>>() {
                             @Override
                             public void onCompleted() {
                                 if (isLinkView()) return;
@@ -49,7 +52,7 @@ public class GamePresenter extends BasePresenter<GameView> {
                             }
 
                             @Override
-                            public void onNext(BaseResponse<UserTaskMsgBean> baseResponse) {
+                            public void onNext(BaseResponse<MyInfo> baseResponse) {
                                 if (isLinkView()) return;
 
                                 int code = baseResponse.getStatus();
@@ -214,6 +217,8 @@ public class GamePresenter extends BasePresenter<GameView> {
         vo.put("osversion", deviceInfo.getOSVersion());
         vo.put("appversion", deviceInfo.getVersionName());
         vo.put("appPkgList", deviceInfo.getPkgInfo(context));
+        vo.put("oaid", DevicesUtil.getOaid());
+        vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.saveTerminalInfo(vo),
                         new BaseSubscriber<BaseResponse<Object>>() {

highgold/app/src/main/java/com/mints/highgold/mvp/presenters/GoldTryPresenter.java

@@ -2,7 +2,9 @@ package com.mints.highgold.mvp.presenters;
 
 import com.mints.highgold.manager.AppHttpManager;
 import com.mints.highgold.mvp.model.BaseResponse;
+import com.mints.highgold.mvp.model.DrawcashBean;
 import com.mints.highgold.mvp.model.GoldRecordBean;
+import com.mints.highgold.mvp.model.MyInfo;
 import com.mints.highgold.mvp.model.UserTaskMsgBean;
 import com.mints.highgold.mvp.views.GoldTryView;
 import com.mints.library.net.neterror.BaseSubscriber;
@@ -17,8 +19,8 @@ public class GoldTryPresenter extends BasePresenter<GoldTryView> {
         view.showLoading("加载中...");
 
         AppHttpManager.getInstance(loanApplication)
-                .call(loanService.getDrawcashUserTaskMsg(),
-                        new BaseSubscriber<BaseResponse<UserTaskMsgBean>>() {
+                .call(loanService.getMyInfoMsg(),
+                        new BaseSubscriber<BaseResponse<MyInfo>>() {
                             @Override
                             public void onCompleted() {
                                 if (isLinkView()) return;
@@ -35,7 +37,7 @@ public class GoldTryPresenter extends BasePresenter<GoldTryView> {
                             }
 
                             @Override
-                            public void onNext(BaseResponse<UserTaskMsgBean> baseResponse) {
+                            public void onNext(BaseResponse<MyInfo> baseResponse) {
                                 if (isLinkView()) return;
 
                                 int code = baseResponse.getStatus();

highgold/app/src/main/java/com/mints/highgold/mvp/presenters/LoanPresenter.java

@@ -19,6 +19,7 @@ import com.mints.highgold.mvp.model.UserBean;
 import com.mints.highgold.mvp.model.UserTaskMsgBean;
 import com.mints.highgold.mvp.views.LoanView;
 import com.mints.highgold.utils.DeviceUuidFactory;
+import com.mints.highgold.utils.DevicesUtil;
 import com.mints.highgold.utils.SPUtil;
 import com.mints.library.net.neterror.BaseSubscriber;
 import com.mints.library.net.neterror.Throwable;
@@ -604,6 +605,8 @@ public class LoanPresenter extends BasePresenter<LoanView> {
         vo.put("osversion", deviceInfo.getOSVersion());
         vo.put("appversion", deviceInfo.getVersionName());
         vo.put("appPkgList", deviceInfo.getPkgInfo(context));
+        vo.put("oaid", DevicesUtil.getOaid());
+        vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.saveTerminalInfo(vo),
                         new BaseSubscriber<BaseResponse<Object>>() {
@@ -689,7 +692,8 @@ public class LoanPresenter extends BasePresenter<LoanView> {
         vo.put("osversion", deviceInfo.getOSVersion());
         vo.put("appversion", deviceInfo.getVersionName());
         vo.put("appPkgList", deviceInfo.getPkgInfo(context));
-
+        vo.put("oaid", DevicesUtil.getOaid());
+        vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.saveTerminalInfo(vo),
                         new BaseSubscriber<BaseResponse<UserBean>>() {

highgold/app/src/main/java/com/mints/highgold/mvp/presenters/LoginPresenter.java

@@ -16,6 +16,7 @@ import com.mints.highgold.mvp.model.LocationBean;
 import com.mints.highgold.mvp.model.UserBean;
 import com.mints.highgold.mvp.views.LoginView;
 import com.mints.highgold.utils.DeviceUuidFactory;
+import com.mints.highgold.utils.DevicesUtil;
 import com.mints.highgold.utils.SPUtil;
 import com.mints.library.net.neterror.BaseSubscriber;
 import com.mints.library.net.neterror.Throwable;
@@ -320,7 +321,8 @@ public class LoginPresenter extends BasePresenter<LoginView> {
         vo.put("osversion", deviceInfo.getOSVersion());
         vo.put("appversion", deviceInfo.getVersionName());
         vo.put("appPkgList", deviceInfo.getPkgInfo(context));
-
+        vo.put("oaid", DevicesUtil.getOaid());
+        vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.saveTerminalInfo(vo),
                         new BaseSubscriber<BaseResponse<UserBean>>() {

highgold/app/src/main/java/com/mints/highgold/mvp/presenters/MyPresenter.java

@@ -14,6 +14,7 @@ import com.mints.highgold.mvp.model.MyInfo;
 import com.mints.highgold.mvp.model.UserBean;
 import com.mints.highgold.mvp.views.MyView;
 import com.mints.highgold.utils.DeviceUuidFactory;
+import com.mints.highgold.utils.DevicesUtil;
 import com.mints.library.net.neterror.BaseSubscriber;
 import com.mints.library.net.neterror.Throwable;
 
@@ -253,6 +254,8 @@ public class MyPresenter extends BasePresenter<MyView> {
         vo.put("osversion", deviceInfo.getOSVersion());
         vo.put("appversion", deviceInfo.getVersionName());
         vo.put("appPkgList", deviceInfo.getPkgInfo(context));
+        vo.put("oaid", DevicesUtil.getOaid());
+        vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.saveTerminalInfo(vo),
                         new BaseSubscriber<BaseResponse<Object>>() {

highgold/app/src/main/java/com/mints/highgold/mvp/presenters/WxLoginPresenter.java

@@ -15,6 +15,7 @@ import com.mints.highgold.mvp.model.LocationBean;
 import com.mints.highgold.mvp.model.UserBean;
 import com.mints.highgold.mvp.views.WxLoginView;
 import com.mints.highgold.utils.DeviceUuidFactory;
+import com.mints.highgold.utils.DevicesUtil;
 import com.mints.highgold.utils.SPUtil;
 import com.mints.library.net.neterror.BaseSubscriber;
 import com.mints.library.net.neterror.Throwable;
@@ -154,7 +155,8 @@ public class WxLoginPresenter extends BasePresenter<WxLoginView> {
         vo.put("osversion", deviceInfo.getOSVersion());
         vo.put("appversion", deviceInfo.getVersionName());
         vo.put("appPkgList", deviceInfo.getPkgInfo(context));
-
+        vo.put("oaid", DevicesUtil.getOaid());
+        vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.saveTerminalInfo(vo),
                         new BaseSubscriber<BaseResponse<UserBean>>() {

highgold/app/src/main/java/com/mints/highgold/mvp/views/DrawcashView.java

 package com.mints.highgold.mvp.views;
 
 
+import com.mints.highgold.mvp.model.DrawcashBean;
 import com.mints.highgold.mvp.model.UserTaskMsgBean;
 
 public interface DrawcashView extends BaseView {
     /**
      * 获取用户配置信息成功
      */
-    void getUserTaskMsgSuc(UserTaskMsgBean data);
+    void getUserTaskMsgSuc(DrawcashBean data);
 
     /**
      * 提现成功

highgold/app/src/main/java/com/mints/highgold/mvp/views/GameView.java

 package com.mints.highgold.mvp.views;
 
 
+import com.mints.highgold.mvp.model.DrawcashBean;
+import com.mints.highgold.mvp.model.MyInfo;
 import com.mints.highgold.mvp.model.UserTaskMsgBean;
 
 public interface GameView extends BaseView {
     /**
      * 获取用户配置信息成功
      */
-    void getUserTaskMsgSuc(UserTaskMsgBean data);
+    void getUserTaskMsgSuc(MyInfo data);
     /**
      * 获取用户配置信息失败
      */

highgold/app/src/main/java/com/mints/highgold/mvp/views/GoldTryView.java

 package com.mints.highgold.mvp.views;
 
 
+import com.mints.highgold.mvp.model.DrawcashBean;
 import com.mints.highgold.mvp.model.GoldRecordBean;
+import com.mints.highgold.mvp.model.MyInfo;
 import com.mints.highgold.mvp.model.UserTaskMsgBean;
 
 public interface GoldTryView extends BaseView {
     /**
      * 获取用户配置信息成功
      */
-    void getUserTaskMsgSuc(UserTaskMsgBean data);
+    void getUserTaskMsgSuc(MyInfo data);
 
     /**
      * 获取收入记录成功

highgold/app/src/main/java/com/mints/highgold/net/GsonConverterFactory.java

@@ -13,6 +13,7 @@ import com.mints.highgold.manager.UserManager;
 import com.mints.highgold.mvp.model.BaseResponse;
 import com.mints.highgold.mvp.model.UserBean;
 import com.mints.highgold.utils.DeviceUuidFactory;
+import com.mints.highgold.utils.DevicesUtil;
 import com.mints.highgold.utils.ForegroundOrBackground;
 import com.mints.library.net.neterror.BaseSubscriber;
 import com.mints.library.net.neterror.Throwable;
@@ -247,7 +248,8 @@ public class GsonConverterFactory extends Converter.Factory {
         vo.put("osversion", deviceInfo.getOSVersion());
         vo.put("appversion", deviceInfo.getVersionName());
         vo.put("appPkgList", deviceInfo.getPkgInfo(context));
-
+        vo.put("oaid", DevicesUtil.getOaid());
+        vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
         loanApplication.getLoanService().saveTerminalInfo(vo)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribeOn(loanApplication.defaultSubscribeScheduler())

highgold/app/src/main/java/com/mints/highgold/net/HytechGsonConverterFactory.java

@@ -13,6 +13,7 @@ import com.mints.highgold.manager.UserManager;
 import com.mints.highgold.mvp.model.BaseResponse;
 import com.mints.highgold.mvp.model.UserBean;
 import com.mints.highgold.utils.DeviceUuidFactory;
+import com.mints.highgold.utils.DevicesUtil;
 import com.mints.highgold.utils.ForegroundOrBackground;
 import com.mints.library.net.neterror.BaseSubscriber;
 import com.mints.library.net.neterror.Throwable;
@@ -246,7 +247,8 @@ public class HytechGsonConverterFactory extends Converter.Factory {
         vo.put("osversion", deviceInfo.getOSVersion());
         vo.put("appversion", deviceInfo.getVersionName());
         vo.put("appPkgList", deviceInfo.getPkgInfo(context));
-
+        vo.put("oaid", DevicesUtil.getOaid());
+        vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
         loanApplication.getLoanService().saveTerminalInfo(vo)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribeOn(loanApplication.defaultSubscribeScheduler())

highgold/app/src/main/java/com/mints/highgold/net/HytechService.java

@@ -46,7 +46,7 @@ public interface HytechService {
 
             OkHttpClient.Builder builder = new OkHttpClient.Builder();
 
-            builder.retryOnConnectionFailure(true);
+            builder.retryOnConnectionFailure(false);
             builder.connectTimeout(20, TimeUnit.SECONDS);
             builder.readTimeout(20, TimeUnit.SECONDS);
             builder.writeTimeout(20, TimeUnit.SECONDS);

highgold/app/src/main/java/com/mints/highgold/net/LoanService.java

@@ -9,6 +9,7 @@ import com.mints.highgold.common.Constant;
 import com.mints.highgold.mvp.model.AlipayBindBean;
 import com.mints.highgold.mvp.model.BannerBean;
 import com.mints.highgold.mvp.model.BaseResponse;
+import com.mints.highgold.mvp.model.DrawcashBean;
 import com.mints.highgold.mvp.model.DrawcashRecordBean;
 import com.mints.highgold.mvp.model.FallBean;
 import com.mints.highgold.mvp.model.FriendsRecordBean;
@@ -136,8 +137,8 @@ public interface LoanService {
      *
      * @return
      */
-    @POST("api/v115/getUserCoinMsg")
-    Observable<BaseResponse<UserTaskMsgBean>> getDrawcashUserTaskMsg();
+    @POST("api/high/getUserCoinMsg")
+    Observable<BaseResponse<DrawcashBean>> getDrawcashUserTaskMsg();
 
     /**
      * 我的界面信息
@@ -475,7 +476,7 @@ public interface LoanService {
 
             OkHttpClient.Builder builder = new OkHttpClient.Builder();
 
-            builder.retryOnConnectionFailure(true);
+            builder.retryOnConnectionFailure(false);
             builder.connectTimeout(20, TimeUnit.SECONDS);
             builder.readTimeout(20, TimeUnit.SECONDS);
             builder.writeTimeout(20, TimeUnit.SECONDS);
@@ -507,32 +508,32 @@ public interface LoanService {
             builder.interceptors().add(okHttpInterceptor);
 
             Retrofit retrofit;
-//            if (BuildConfig.DEBUG) {
-//                SPUtil spUtil = SPUtil.getInstance(context);
-//                if (TextUtils.isEmpty(spUtil.getString(Constant.LOCAL_IP))) {
-//                    spUtil.putString(Constant.LOCAL_IP, "http://39.106.5.102:9082/gs-api/");
-//                }
-//                retrofit = new Retrofit.Builder()
-//                        .client(builder.build())
-//                        .baseUrl(spUtil.getString(Constant.LOCAL_IP))
-//                        .addConverterFactory(GsonConverterFactory.create())
-//                        .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-//                        .build();
-//            } else {
-//                retrofit = new Retrofit.Builder()
-//                        .client(builder.build())
-//                        .baseUrl(BuildConfig.MainIp)
-//                        .addConverterFactory(GsonConverterFactory.create())
-//                        .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-//                        .build();
-//            }
+            if (BuildConfig.DEBUG) {
+                SPUtil spUtil = SPUtil.getInstance(context);
+                if (TextUtils.isEmpty(spUtil.getString(Constant.LOCAL_IP))) {
+                    spUtil.putString(Constant.LOCAL_IP, "http://39.106.5.102:9082/gs-api/");
+                }
+                retrofit = new Retrofit.Builder()
+                        .client(builder.build())
+                        .baseUrl(spUtil.getString(Constant.LOCAL_IP))
+                        .addConverterFactory(GsonConverterFactory.create())
+                        .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                        .build();
+            } else {
+                retrofit = new Retrofit.Builder()
+                        .client(builder.build())
+                        .baseUrl(BuildConfig.MainIp)
+                        .addConverterFactory(GsonConverterFactory.create())
+                        .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                        .build();
+            }
 
-            retrofit = new Retrofit.Builder()
-                    .client(builder.build())
-                    .baseUrl(BuildConfig.MainIp)
-                    .addConverterFactory(GsonConverterFactory.create())
-                    .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-                    .build();
+//            retrofit = new Retrofit.Builder()
+//                    .client(builder.build())
+//                    .baseUrl(BuildConfig.MainIp)
+//                    .addConverterFactory(GsonConverterFactory.create())
+//                    .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+//                    .build();
 
 
             return retrofit.create(LoanService.class);

highgold/app/src/main/java/com/mints/highgold/ui/activitys/GoldTryActivity.java

@@ -5,7 +5,9 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.mints.highgold.R;
+import com.mints.highgold.mvp.model.DrawcashBean;
 import com.mints.highgold.mvp.model.GoldRecordBean;
+import com.mints.highgold.mvp.model.MyInfo;
 import com.mints.highgold.mvp.model.UserTaskMsgBean;
 import com.mints.highgold.mvp.presenters.GoldTryPresenter;
 import com.mints.highgold.mvp.views.GoldTryView;
@@ -77,7 +79,7 @@ public class GoldTryActivity extends BaseActivity implements GoldTryView,
     }
 
     @Override
-    public void getUserTaskMsgSuc(UserTaskMsgBean data) {
+    public void getUserTaskMsgSuc(MyInfo data) {
         if (data == null) return;
 
         tvGoldtryGold.setText(data.getCoin() + "");

highgold/app/src/main/java/com/mints/highgold/ui/activitys/RedboxActivity.java

@@ -262,39 +262,8 @@ public class RedboxActivity extends BaseActivity implements RedboxView {
             return;
         }
 
-//        int type = data.getType();// 0直接领取  1看视频领取
-//        int canDouble = data.getCanDouble();// 是否可以翻倍
-//        if (type == 0) {
-//            // 直接领取
-//            HashMap<String, Object> vo = new HashMap<>();
-//            vo.put("numKey", data.getNumKey());
-//            vo.put("carrierType", Constant.CARRIER_REDENVELOPE);
-//            redboxPresenter.reportAddCoinMsg(vo);
-//
-//            bundle.putString(Constant.MAIN_CARRIET_TURN, Constant.CARRIER_REDENVELOPE_CASH);
-//            bundle.putInt(Constant.MAIN_CUR_FLAG, Constant.MAIN_CUR_ONE);
-//        } else {
-//            // 看视频领取
-//
-//            if (canDouble == 0) {
-//                // 不可翻倍
-//
-//                bundle.putString(Constant.MAIN_CARRIET_TURN, Constant.CARRIER_REDENVELOPE);
-//                bundle.putInt(Constant.MAIN_CUR_FLAG, Constant.MAIN_CUR_TWO);
-//            } else {
-//                // 翻倍
-//
-//                bundle.putString(Constant.MAIN_CARRIET_TURN, Constant.CARRIER_REDENVELOPE_DOUBLE);
-//            }
-//        }
         Bundle bundle = new Bundle();
-        if (data.getStatus() == 1) {
-            // 看视频才能领奖励
-            bundle.putString(Constant.MAIN_CARRIET_TURN, Constant.CARRIER_REDENVELOPE);
-        } else {
-            // 金币翻倍
-            bundle.putString(Constant.MAIN_CARRIET_TURN, Constant.CARRIER_REDENVELOPE_DOUBLE);
-        }
+        bundle.putString(Constant.MAIN_CARRIET_TURN, Constant.CARRIER_REDENVELOPE);
         bundle.putInt(Constant.MAIN_CUR_COIN, data.getCoin());
         bundle.putInt(Constant.MAIN_ALL_COIN, data.getSumCoin());
         bundle.putString(Constant.MAIN_EXTRA_ID, data.getNumKey());

highgold/app/src/main/java/com/mints/highgold/ui/fragment/GameFragment.java

@@ -20,6 +20,8 @@ import com.mints.highgold.R;
 import com.mints.highgold.common.AppConfig;
 import com.mints.highgold.common.Constant;
 import com.mints.highgold.manager.UserManager;
+import com.mints.highgold.mvp.model.DrawcashBean;
+import com.mints.highgold.mvp.model.MyInfo;
 import com.mints.highgold.mvp.model.UserTaskMsgBean;
 import com.mints.highgold.mvp.presenters.GamePresenter;
 import com.mints.highgold.mvp.views.GameView;
@@ -60,7 +62,7 @@ public class GameFragment extends BaseFragment
 
     private GamePresenter gamePresenter;
 
-    private UserTaskMsgBean userConfig = null;
+    private MyInfo userConfig = null;
 
     private String gameName;
     private String gameID;
@@ -181,7 +183,7 @@ public class GameFragment extends BaseFragment
     }
 
     @Override
-    public void getUserTaskMsgSuc(UserTaskMsgBean data) {
+    public void getUserTaskMsgSuc(MyInfo data) {
         if (data == null) {
             userConfig = null;
             return;

highgold/app/src/main/java/com/mints/highgold/ui/fragment/MainFragment.java

@@ -69,6 +69,8 @@ import com.mints.highgold.ui.widgets.WaterView;
 import com.mints.highgold.ui.widgets.countdowntimer.CountDownTimerSupport;
 import com.mints.highgold.ui.widgets.countdowntimer.OnCountDownTimerListener;
 import com.mints.highgold.ui.widgets.refresh.CustomRefreshLayout;
+import com.mints.highgold.utils.DeviceUuidFactory;
+import com.mints.highgold.utils.DevicesUtil;
 import com.mints.highgold.utils.MD5;
 import com.mints.highgold.utils.SPUtil;
 import com.mints.highgold.utils.SpanUtils;
@@ -405,6 +407,10 @@ public class MainFragment extends BaseFragment
         Bundle bundle;
         switch (view.getId()) {
             case R.id.tv_fragment_main_whatgold:// 如何赚金币
+                System.out.println("mcg __ getPesudoUniqueID:"+ DevicesUtil.getPesudoUniqueID());
+                System.out.println("mcg __ getUUID:"+ DevicesUtil.getUUID());
+                System.out.println("mcg __ googld device UUID:"+ new DeviceUuidFactory(getContext()).getDeviceUuid().toString());
+
                 readyGo(WhatGoldActivity.class);
                 break;
             case R.id.iv_fragment_main_putcard:// 补卡

highgold/app/src/main/java/com/mints/highgold/utils/DevicesUtil.java

@@ -65,19 +65,12 @@ public class DevicesUtil {
         String serial = null;
         String m_szDevIDShort = "35" +
                 Build.BOARD.length() % 10 + Build.BRAND.length() % 10 +
-
                 Build.CPU_ABI.length() % 10 + Build.DEVICE.length() % 10 +
-
                 Build.DISPLAY.length() % 10 + Build.HOST.length() % 10 +
-
                 Build.ID.length() % 10 + Build.MANUFACTURER.length() % 10 +
-
                 Build.MODEL.length() % 10 + Build.PRODUCT.length() % 10 +
-
                 Build.TAGS.length() % 10 + Build.TYPE.length() % 10 +
-
                 Build.USER.length() % 10; //13 位
-
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 serial = android.os.Build.getSerial();

highgold/app/src/main/res/layout/activity_drawcash.xml

@@ -163,12 +163,10 @@
                     android:layout_marginBottom="20pt"
                     android:background="@color/order_hint_color" />
 
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="50pt"
-                    android:layout_marginTop="20pt"
                     android:layout_marginRight="50pt"
                     android:orientation="horizontal">
 
@@ -209,12 +207,69 @@
 
                 </LinearLayout>
 
+                <LinearLayout
+                    android:visibility="gone"
+                    android:id="@+id/ll_drawcash_top"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="60pt"
+                    android:layout_marginTop="10pt"
+                    android:layout_marginRight="60pt"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="提现说明"
+                        android:textColor="@color/black"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/tv_drawcash_hint_top"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20pt"
+                        android:text="每新邀请X位有效好友即可提现，提现成功立返8x金币"
+                        android:textColor="@color/graya"
+                        android:textSize="12sp" />
+
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20pt">
+
+                        <TextView
+                            android:id="@+id/tv_drawcash_friends_top"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:text="可用有效好友数"
+                            android:textColor="@color/main_mints"
+                            android:textSize="14sp" />
+
+                        <TextView
+                            android:id="@+id/tv_drawcash_friendsnext_top"
+                            android:layout_width="150pt"
+                            android:layout_height="60pt"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:background="@drawable/shape_tv_gold"
+                            android:gravity="center"
+                            android:text="邀请好友"
+                            android:textColor="@color/white"
+                            android:textSize="10sp" />
+                    </RelativeLayout>
+
+                </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="50pt"
                     android:layout_marginTop="20pt"
                     android:layout_marginRight="50pt"
+                    android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <Button
@@ -249,16 +304,62 @@
 
                 </LinearLayout>
 
-
-                <TextView
-                    android:id="@+id/tv_drawcash_wxnotify"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:visibility="gone"
+                    android:id="@+id/ll_drawcash_bottom"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="50pt"
-                    android:layout_marginTop="30pt"
-                    android:layout_marginRight="50pt"
-                    android:textColor="@color/gold_try_color"
-                    android:textSize="14sp" />
+                    android:layout_marginLeft="60pt"
+                    android:layout_marginTop="10pt"
+                    android:layout_marginRight="60pt"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="提现说明"
+                        android:textColor="@color/black"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/tv_drawcash_hint_bottom"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20pt"
+                        android:text="每新邀请X位有效好友即可提现，提现成功立返8x金币"
+                        android:textColor="@color/graya"
+                        android:textSize="12sp" />
+
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20pt">
+
+                        <TextView
+                            android:id="@+id/tv_drawcash_friends_bottom"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:text="可用有效好友数"
+                            android:textColor="@color/main_mints"
+                            android:textSize="14sp" />
+
+                        <TextView
+                            android:id="@+id/tv_drawcash_friendsnext_bottom"
+                            android:layout_width="150pt"
+                            android:layout_height="60pt"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:background="@drawable/shape_tv_gold"
+                            android:gravity="center"
+                            android:text="邀请好友"
+                            android:textColor="@color/white"
+                            android:textSize="10sp" />
+                    </RelativeLayout>
+
+                </LinearLayout>
+
 
                 <TextView
                     android:id="@+id/tv_drawcash_explain"