1.0.2发版

highgold/app/src/main/java/com/mints/highgold/ad/inscreen/InsertScreenAdManager.java

@@ -30,7 +30,7 @@ public class InsertScreenAdManager {
     }
 
     public void showInsertScreenAd(String carrierType) {
-//        initInsertScreenAd(carrierType);
+        initInsertScreenAd(carrierType);
     }
 
     public void ondestory() {

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

@@ -110,6 +110,7 @@ public class GamePresenter extends BasePresenter<GameView> {
         HashMap<String, Object> vo = new HashMap<>();
         String uuid = new DeviceUuidFactory(loanApplication).getDeviceUuid().toString();
         vo.put("device", uuid);
+        vo.put("uid", UserManager.getInstance().getUserID());
 //        vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID()+System.currentTimeMillis()));
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.visitorlogin(vo),

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

@@ -460,7 +460,7 @@ public class LoanPresenter extends BasePresenter<LoanView> {
         HashMap<String, Object> vo = new HashMap<>();
         uuid = new DeviceUuidFactory(loanApplication).getDeviceUuid().toString();
         vo.put("device", uuid);
-//        vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID()+System.currentTimeMillis()));
+        vo.put("uid", UserManager.getInstance().getUserID());
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.visitorlogin(vo),
                         new BaseSubscriber<BaseResponse<UserBean>>() {

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

@@ -178,7 +178,7 @@ public class MyPresenter extends BasePresenter<MyView> {
         HashMap<String, Object> vo = new HashMap<>();
         String uuid = new DeviceUuidFactory(loanApplication).getDeviceUuid().toString();
         vo.put("device", uuid);
-//        vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID() + System.currentTimeMillis()));
+        vo.put("uid", UserManager.getInstance().getUserID());
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.visitorlogin(vo),
                         new BaseSubscriber<BaseResponse<UserBean>>() {

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

@@ -378,7 +378,7 @@ public class VersusPresenter extends BasePresenter<VersusView> {
         HashMap<String, Object> vo = new HashMap<>();
         String uuid = new DeviceUuidFactory(loanApplication).getDeviceUuid().toString();
         vo.put("device", uuid);
-//        vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID() + System.currentTimeMillis()));
+        vo.put("uid", UserManager.getInstance().getUserID());
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.visitorlogin(vo),
                         new BaseSubscriber<BaseResponse<UserBean>>() {

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

@@ -160,6 +160,7 @@ public class GsonConverterFactory extends Converter.Factory {
         HashMap<String, Object> vo = new HashMap<>();
         String uuid = new DeviceUuidFactory(loanApplication).getDeviceUuid().toString();
         vo.put("device", uuid);
+        vo.put("uid", UserManager.getInstance().getUserID());
 //        vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID()+System.currentTimeMillis()));
         loanApplication.getLoanService().visitorlogin(vo)
                 .observeOn(AndroidSchedulers.mainThread())

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

@@ -476,32 +476,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/api-p1/");
-                }
-                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/api-p1/");
+//                }
+//                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/RedboxActivity.java

@@ -160,8 +160,12 @@ public class RedboxActivity extends BaseActivity implements RedboxView {
     protected void onResume() {
         super.onResume();
 
-        insertScreenAd.showInsertScreenAd(Constant.CARRIER_REDENVELOPE);
+        if (tvRedboxOne != null) {
+            if (AntiShake.check(tvRedboxOne.getId())) return;
+        }
+        System.out.println("mcg __ redbox onresume");
 
+        insertScreenAd.showInsertScreenAd(Constant.CARRIER_REDENVELOPE);
         redboxPresenter.getAllRedEnvelopeMsg();
     }
 

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

@@ -407,10 +407,6 @@ 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/ui/fragment/MyFragment.java

@@ -145,13 +145,13 @@ public class MyFragment extends BaseFragment
         super.onResume();
         if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_MY) {
             //应用商店上线隐藏广告
-//        if (userManager.getAdShowFlag()) {
-//            if (ttUtil != null && flMyTtbanner != null) {
-//                ttUtil.getBannerInit(getContext(), TTAdManagerHolder.TT_AD_BANNER_ID_MY, flMyTtbanner, 370, 80);
-//            }
-//        } else {
-//            flMyTtbanner.setVisibility(View.GONE);
-//        }
+            if (userManager.getAdShowFlag()) {
+                if (ttUtil != null && flMyTtbanner != null) {
+                    ttUtil.getBannerInit(getContext(), TTAdManagerHolder.TT_AD_BANNER_ID_MY, flMyTtbanner, 370, 80);
+                }
+            } else {
+                flMyTtbanner.setVisibility(View.GONE);
+            }
 
             if (!TextUtils.isEmpty(userManager.getUserID())) {
                 myPresenter.getUserTaskMsg(false);