1.0.5发版

highgold/app/src/main/java/com/mints/highgold/ad/MintegralVedioAdManager.java

@@ -222,7 +222,7 @@ public class MintegralVedioAdManager implements MintegralVedioAdManagerView {
 
                     if (isClickScreen) {
                         // 防止重复
-                        TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_HYTECH, Constant.EVENT_TYPE_FOUR, "", "");
+                        TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_MINTEGRAL, Constant.EVENT_TYPE_FOUR, "", "");
                         isClickScreen = false;
                     }
 

highgold/app/src/main/java/com/mints/highgold/ad/VedioAdingManager.java

@@ -3,11 +3,13 @@ package com.mints.highgold.ad;
 import android.app.Activity;
 import android.text.TextUtils;
 
+import com.mints.highgold.MintsApplication;
 import com.mints.highgold.common.AppConfig;
 import com.mints.highgold.common.Constant;
 import com.mints.highgold.mvp.model.VedioAdingBean;
 import com.mints.highgold.mvp.model.WeightBean;
 import com.mints.highgold.utils.ToastUtil;
+import com.mints.library.utils.json.JsonUtil;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -152,14 +154,14 @@ public class VedioAdingManager {
             weightList.add(new WeightBean(hytechVedioWeight, Constant.HYTECH_VEDIO_AD));
             System.out.print("  mcg __ 权重值：hytechVedioWeight:" + hytechVedioWeight);
         }
-        if (AppConfig.ylhAdCount > 0) {
-            weightList.add(new WeightBean(ylhWeight, Constant.YLH_VEDIO_AD));
-            System.out.println("  mcg __ 权重值：ylhWeight:" + ylhWeight);
-        }
         if (AppConfig.mintegralAdCount > 0) {
             weightList.add(new WeightBean(mintegralWeight, Constant.MINTEGRAL_VEDIO_AD));
             System.out.println("  mcg __ 权重值：mintegralWeight:" + mintegralWeight);
         }
+        if (AppConfig.ylhAdCount > 0) {
+            weightList.add(new WeightBean(ylhWeight, Constant.YLH_VEDIO_AD));
+            System.out.println("  mcg __ 权重值：ylhWeight:" + ylhWeight);
+        }
 
         // 权重随机
         if (weightList != null && weightList.size() > 0) {

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

@@ -16,6 +16,7 @@ import com.mints.highgold.ad.inscreen.InsertScreenAdManager;
 import com.mints.highgold.common.Constant;
 import com.mints.highgold.login.LoginApi;
 import com.mints.highgold.login.OnLoginListener;
+import com.mints.highgold.manager.AmapLocationManager;
 import com.mints.highgold.manager.TTAdManagerHolder;
 import com.mints.highgold.manager.TTBannerManager;
 import com.mints.highgold.manager.UserManager;
@@ -24,6 +25,7 @@ import com.mints.highgold.mvp.model.WXInfo;
 import com.mints.highgold.mvp.presenters.DrawcashPresenter;
 import com.mints.highgold.mvp.views.DrawcashView;
 import com.mints.highgold.ui.activitys.base.BaseActivity;
+import com.mints.highgold.utils.SPUtil;
 import com.mints.highgold.utils.SpanUtils;
 import com.mints.library.utils.json.JsonUtil;
 import com.mints.library.utils.nodoubleclick.AntiShake;
@@ -104,6 +106,8 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
 
     private DrawcashPresenter drawcashPresenter;
 
+    private AmapLocationManager.LocationHandler mLocationHandler = null;
+
     private double curCash = 100;//当前要提现的钱
     private TTBannerManager ttUtil;
 
@@ -119,6 +123,7 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
 
     private UserManager userManager;
     private InsertScreenAdManager insertScreenAd;
+    private SPUtil spUtil;
 
     @Override
     protected int getContentViewLayoutID() {
@@ -133,8 +138,12 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
         tvActivityTitle.setText("提现");
 
         userManager = UserManager.getInstance();
+        spUtil = SPUtil.getInstance(getContext());
         insertScreenAd = new InsertScreenAdManager(DrawcashActivity.this);
 
+        if (TextUtils.isEmpty(spUtil.getString(Constant.LOCATION_DATA))) {
+            mLocationHandler = new AmapLocationManager.LocationHandler(this);
+        }
 
         // 加载banner广告
         //应用商店上线隐藏广告
@@ -189,6 +198,12 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
             insertScreenAd.ondestory();
         }
 
+        if (mLocationHandler != null) {
+            mLocationHandler.removeCallbacksAndMessages(null);
+            mLocationHandler = null;
+            AmapLocationManager.getInstance().locationonDestroy();
+        }
+
         drawcashPresenter.detachView();
     }
 
@@ -485,6 +500,12 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
                                 Manifest.permission.ACCESS_FINE_LOCATION)
                         .subscribe(granted -> {
                             if (granted) {
+                                if (TextUtils.isEmpty(spUtil.getString(Constant.LOCATION_DATA))) {
+                                    if (mLocationHandler != null) {
+                                        AmapLocationManager.getInstance().startLocation(mLocationHandler);
+                                    }
+                                }
+
                                 drawcashPresenter.saveTerminalInfo(getContext(), curCash, paymentType);
                             } else {
                                 showMissingPermissionDialog("设备,地理位置");