穿山甲广告优化，增加android10获取设备号判断

app/src/androidTest/java/com/kuxuan/moneynote/ui/activitys/person/MainTest.java

@@ -0,0 +1,20 @@
+package com.kuxuan.moneynote.ui.activitys.person;
+
+/**
+ * create by ${xieshengqi}
+ * create time 2019-10-24
+ */
+public class MainTest {
+
+
+
+    public static void main(String []args){
+
+
+
+
+    }
+
+
+
+}

app/src/main/java/com/kuxuan/moneynote/MyApplication.java

@@ -96,6 +96,7 @@ public class MyApplication extends MultiDexApplication {
 //        }
 //        LeakCanary.install(this);
 //、
+
         Myapp.context = getApplicationContext();
         //初始化活动页的上传参数
         typeface = Typeface.createFromAsset(getAssets(), "fonts/share.ttf");
@@ -106,26 +107,7 @@ public class MyApplication extends MultiDexApplication {
         CidVersionInterceptor.init(BuildConfig.CHANNLE, BuildConfig.VERSION_NAME);
         com.xieshengqi.kuxuanactivitymd.util.DisplayUtil.init(this);
         DbManager.init();
-        //友盟配置
-        UMConfigure.setLogEnabled(true);
-        UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, null);
-        UMUtils.setChannel(this, BuildConfig.CHANNLE);
-        //设置友盟采集模式
-
-        MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.LEGACY_MANUAL);
-//友盟支持在子线程中统计自定义事件
-        UMConfigure.setProcessEvent(true);
-        QueuedWork.isUseThreadPool = false;
-        UMShareAPI.get(this);
-        UIUtils.getInstance(this);
-//        DisplayUtil.init(this);
-//        initComponent();
-//        initJpush();
-        //各个平台的配置，建议放在全局Application或者程序入口
-        {
-            PlatformConfig.setWeixin("wxee1937fe7fbf238d", "2016584eff63b03b5a911d41c12519b3");
-            PlatformConfig.setQQZone("1106442579", "JOrDegUoYlf0m73n");
-        }
+        umengConfig();
         initTTAdSdk();
         initPush();
         //api 27后监听网络变化
@@ -157,6 +139,29 @@ public class MyApplication extends MultiDexApplication {
     }
 
     /**
+     * 友盟初始化
+     */
+    private void umengConfig(){
+        //友盟配置
+        UMConfigure.setLogEnabled(true);
+        UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, null);
+        UMUtils.setChannel(this, BuildConfig.CHANNLE);
+        //设置友盟采集模式
+
+        MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.LEGACY_MANUAL);
+//友盟支持在子线程中统计自定义事件
+        UMConfigure.setProcessEvent(true);
+        QueuedWork.isUseThreadPool = false;
+        UMShareAPI.get(this);
+        UIUtils.getInstance(this);
+        //各个平台的配置，建议放在全局Application或者程序入口
+        {
+            PlatformConfig.setWeixin("wxee1937fe7fbf238d", "2016584eff63b03b5a911d41c12519b3");
+            PlatformConfig.setQQZone("1106442579", "JOrDegUoYlf0m73n");
+        }
+    }
+
+    /**
      * 推送配置
      */
     private void initPush() {

app/src/main/java/com/kuxuan/moneynote/SplashActivity.java

@@ -8,6 +8,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Message;
@@ -217,34 +218,41 @@ public class SplashActivity extends FragmentActivity implements WeakHandler.IHan
      * 获取权限信息
      */
     private void getImeipermission() {
-        RxPermissions rxPermission = new RxPermissions(SplashActivity.this);
-        rxPermission
-                .requestEach(
-                        android.Manifest.permission.READ_PHONE_STATE
-                )
-                .subscribe(new io.reactivex.functions.Consumer<Permission>() {
-                    @Override
-                    public void accept(Permission permission) throws Exception {
-                        if (permission.granted) {
-                            // 用户已经同意该权限
-                            if (permission.name.equals("android.permission.READ_PHONE_STATE")) {
-                                getIMEI(SplashActivity.this);
+        //在android10以前可以获取设备号标识
+        if(Build.VERSION.SDK_INT<=Build.VERSION_CODES.P){
+            RxPermissions rxPermission = new RxPermissions(SplashActivity.this);
+            rxPermission
+                    .requestEach(
+                            android.Manifest.permission.READ_PHONE_STATE
+                    )
+                    .subscribe(new io.reactivex.functions.Consumer<Permission>() {
+                        @Override
+                        public void accept(Permission permission) throws Exception {
+                            if (permission.granted) {
+                                // 用户已经同意该权限
+                                if (permission.name.equals("android.permission.READ_PHONE_STATE")) {
+                                    getIMEI(SplashActivity.this);
+                                }
+
+                            } else if (permission.shouldShowRequestPermissionRationale) {
+                                // 用户拒绝了该权限，没有选中『不再询问』（Never ask again）,那么下次再次启动时，还会提示请求权限的对话框
+                                if (permission.name.equals("android.permission.READ_PHONE_STATE")) {
+                                    getAndroidId();
+                                }
+                            } else {
+                                // 用户拒绝了该权限，并且选中『不再询问』
+                                if (permission.name.equals("android.permission.READ_PHONE_STATE")) {
+                                    getAndroidId();
+                                }
                             }
 
-                        } else if (permission.shouldShowRequestPermissionRationale) {
-                            // 用户拒绝了该权限，没有选中『不再询问』（Never ask again）,那么下次再次启动时，还会提示请求权限的对话框
-                            if (permission.name.equals("android.permission.READ_PHONE_STATE")) {
-                                getAndroidId();
-                            }
-                        } else {
-                            // 用户拒绝了该权限，并且选中『不再询问』
-                            if (permission.name.equals("android.permission.READ_PHONE_STATE")) {
-                                getAndroidId();
-                            }
                         }
+                    });
+        }else{
+            //在android10系统获取不到IMEI
+            Log.e("IMEI设备号：","android10系统");
+        }
 
-                    }
-                });
     }
 
     /**
@@ -282,6 +290,7 @@ public class SplashActivity extends FragmentActivity implements WeakHandler.IHan
     private void getAndroidId() {
         String m_szAndroidID = ImeiUtil.getUniqueId(this);
         if (!TextUtils.isEmpty(m_szAndroidID))
+            Log.e("IMEIAndroidId设备号:",m_szAndroidID);
             SPUtil.putAndApply(this, Constant.Imei.ANDROIDID, m_szAndroidID);
     }
 
@@ -483,7 +492,6 @@ public class SplashActivity extends FragmentActivity implements WeakHandler.IHan
      * 跳转到主页面
      */
     private void goToMainActivity() {
-
         goMain();
 
     }

app/src/main/java/com/kuxuan/moneynote/ad/AdDialog.java

@@ -6,6 +6,7 @@ import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.app.Activity;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -195,11 +196,12 @@ public class AdDialog {
     private String moneyCount = "0";
 
 
-    public AdDialog(Activity context) {
+    public AdDialog(Activity context,TTAdNative mTTAdNative) {
         this.activity = context;
-        mTTAdNative = TTAdManagerHolder.get().createAdNative(activity);
-        //step3:(可选，强烈建议在合适的时机调用):申请部分权限，如read_phone_state,防止获取不了imei时候，下载类广告没有填充的问题。
-        TTAdManagerHolder.get().requestPermissionIfNecessary(activity);
+        this.mTTAdNative = mTTAdNative;
+//        mTTAdNative = TTAdManagerHolder.get().createAdNative(activity);
+//        //step3:(可选，强烈建议在合适的时机调用):申请部分权限，如read_phone_state,防止获取不了imei时候，下载类广告没有填充的问题。
+//        TTAdManagerHolder.get().requestPermissionIfNecessary(activity);
 //        this.mAQuery = new AQuery2(activity);
         mRequestManager = Glide.with(MyApplication.getInstance());
 
@@ -226,7 +228,6 @@ public class AdDialog {
      * @param isDouble
      */
     public void updataGoldForNet(final int type, final String advert_id, final boolean isQiandao, final boolean isDouble) {
-
         RetrofitClient.getApiService().getAdvertCoin(new GlodBody(type, advert_id, isDouble ? 2 : 1, quesition_id == -1 ? 0 : quesition_id)).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BaseJson<GlodJson>>() {
             @Override
             public void onError(ExceptionHandle.ResponeThrowable e) {
@@ -296,8 +297,8 @@ public class AdDialog {
     }
 
 
-    public AdDialog builder() {
-        return this;
+    public static AdDialog builder(Activity context,TTAdNative mTTAdNative) {
+        return new AdDialog(context,mTTAdNative);
     }
 
 
@@ -855,6 +856,7 @@ public class AdDialog {
     public void dismiss() {
         if (mAdDialog != null)
             mAdDialog.dismiss();
+
     }
 
     TextView tv_money;
@@ -1544,7 +1546,6 @@ public class AdDialog {
                 dismiss();
             }
         });
-
     }
 
 

app/src/main/java/com/kuxuan/moneynote/common/Constant.java

@@ -21,7 +21,7 @@ public class Constant {
     public static final String TOKEN_BASE_URL = "https://apimoney.726p.com/api/";
     public static final String MD5 = "b4b80c2676828f1df375684100f56d48";
 
-    public static final long TOKEN_FAIL_DAY = 7 * 24 * 60 * 60 * 1000L;
+        public static final long TOKEN_FAIL_DAY = 7 * 24 * 60 * 60 * 1000L;
 //    public static final long TOKEN_FAIL_DAY = 60*1000L;
 
     public static final int REQUEST_CODE = 0X20;

app/src/main/java/com/kuxuan/moneynote/ui/activitys/MainActivity.java

@@ -10,6 +10,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.GradientDrawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Looper;
 import android.support.v4.app.ActivityCompat;
@@ -221,6 +222,10 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
 //        Bundle data = in.getExtras();
 //        if (data != null) {
 //            String link_type = data.getString("link_type");
+//            //防止在应用内跳转出现错误
+//            if(TextUtils.isEmpty(link_type)){
+//                return;
+//            }
 //            String url = data.getString("url");
 //            String link_name = data.getString("link_name");
 //            if (link_type.equals("2")) {
@@ -233,10 +238,15 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
 //                startActivity(intent);
 //            } else if (link_type.equals("3")) {
 //                //跳转应用市场
-//                AppMarketUtil.gotoHWMarket(this);
-//            }else{
-//        pushType = Integer.parseInt(data.getString("tab"));
-//    }
+//                AppMarketUtil.gotoMarket(this);
+//            } else {
+//                try {
+//                    Log.e("oppopush", data.getString("tab"));
+//                    pushType = Integer.parseInt(data.getString("tab"))-1;
+//                } catch (Exception e) {
+//
+//                }
+//            }
 //
 //        }
     }
@@ -309,6 +319,8 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
                             //关闭广告
                             SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.SWITCH_SPLASH_AD, false);
                         } else {
+//                            showImageDialog("http://101.200.89.115:8072/uploads/20191021/1571637124686670.png", "https://accountapi.726p.com/qianduo/active-tkl/11-active.html", "双十一活动", "0");
+
                             //打开广告
                             SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.SWITCH_SPLASH_AD, true);
                             if (advert_type == 1) {
@@ -990,7 +1002,9 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
      * @param coin
      */
     private void showDialogForGold(String coin) {
-        adDialog = new AdDialog(this).builder().setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(this);
+        adDialog =  AdDialog.builder(this,mTTAdNative).setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
             @Override
             public void getGoldDouble(int task_type, String pk) {
 
@@ -1021,10 +1035,10 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
      * @param allMoney
      * @param currentMoney
      */
-    private void showMyMoneyDialog(int allMoney, int currentMoney) {
-        new AdDialog(this).builder().prepareToShowMyMoney(ADConstants.AD_OPEN_APP_TIMER, allMoney, currentMoney);
-
-    }
+//    private void showMyMoneyDialog(int allMoney, int currentMoney) {
+//        new AdDialog(this).builder().prepareToShowMyMoney(ADConstants.AD_OPEN_APP_TIMER, allMoney, currentMoney);
+//
+//    }
 
 
     private int currentSelectPosition;
@@ -1221,26 +1235,37 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
      * @return
      */
     public void getIMEI(Context context) {
-        try {
-            //实例化TelephonyManager对象
-            TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-            String imei = null;
-            //获取IMEI号
-            if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
-                imei = telephonyManager.getDeviceId();
-                //在次做个验证，也不是什么时候都能获取到的啊
-                if (imei == null) {
-                    imei = "";
-                }
-                if (!TextUtils.isEmpty(imei)) {
-                    SPUtil.putAndApply(this, Constant.Imei.IMEI, imei);
+        //在android10以前可以获取设备号标识
+        if(Build.VERSION.SDK_INT<=Build.VERSION_CODES.P){
+            try {
+                //实例化TelephonyManager对象
+                TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+                String imei = null;
+                //获取IMEI号
+                if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
+                    imei = telephonyManager.getDeviceId();
+                    //在次做个验证，也不是什么时候都能获取到的啊
+                    if (imei == null) {
+                        imei = "";
+                    }
+                    if (!TextUtils.isEmpty(imei)) {
+                        Log.e("IMEI设备号:",imei);
+                        SPUtil.putAndApply(this, Constant.Imei.IMEI, imei);
+                    } else {
+                        Log.e("IMEI设备号:","没有获取到");
+                    }
                 } else {
+                    getImeipermission();
                 }
-            } else {
-                getImeipermission();
+            } catch (Exception e) {
             }
-        } catch (Exception e) {
+        }else{
+            //在android10系统获取不到IMEI
+            Log.e("IMEI设备号：","android10系统");
+
         }
+
+
     }
 
 

app/src/main/java/com/kuxuan/moneynote/ui/activitys/category/CategoryPresent.java

@@ -321,16 +321,21 @@ public class CategoryPresent extends CategoryContract.CategoryPresent {
         mModel.addCategory(new MVPListener<Object>() {
             @Override
             public void onSuccess(Object content) {
-                mCategoryList.add(mRemoveList.get(position));
-                mRemoveList.remove(position);
-                mAdapter.notifyItemInserted(mCategoryList.size() - 1);
-                mAddAdapter.notifyItemRemoved(position);
-                if (mRemoveList.size() < 1) {
-                    if (view != null)
-                        view.getNullOrNot(false);
-                } else {
-                    if (view != null)
-                        view.getNullOrNot(true);
+                try {
+                    mCategoryList.add(mRemoveList.get(position));
+                    mRemoveList.remove(position);
+                    mAdapter.notifyItemInserted(mCategoryList.size() - 1);
+                    mAddAdapter.notifyItemRemoved(position);
+                    if (mRemoveList.size() < 1) {
+                        if (view != null)
+                            view.getNullOrNot(false);
+                    } else {
+                        if (view != null)
+                            view.getNullOrNot(true);
+                    }
+
+                }catch (Exception e){
+
                 }
 
             }

app/src/main/java/com/kuxuan/moneynote/ui/fragments/MoneyTaskFragmentActivity.java

@@ -1154,8 +1154,9 @@ private RequestManager mRequestManager;
      * @param currentMoney
      */
     private void showMyMoneyDialog(int allMoney, int currentMoney) {
-
-        final AdDialog adDialog = new AdDialog(this).builder().prepareToShowMyMoney(ADConstants.AD_OPEN_APP_TIMER, allMoney, currentMoney);
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(this);
+        final AdDialog adDialog =  AdDialog.builder(this,mTTAdNative).prepareToShowMyMoney(ADConstants.AD_OPEN_APP_TIMER, allMoney, currentMoney);
         adDialog.getmAdDialog().setOnDismissListener(new DialogInterface.OnDismissListener() {
             @Override
             public void onDismiss(DialogInterface dialog) {
@@ -1179,7 +1180,9 @@ private RequestManager mRequestManager;
         if (this.isFinishing()) {
             return;
         }
-        final AdDialog adDialog = new AdDialog(this).builder().preprearToShowGameInfo(ADConstants.AD_OPEN_APP_TIMER, id, startScore, endScore, isRight, quesiton_id, gameHtmlInfo).setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(this);
+        final AdDialog adDialog =  AdDialog.builder(this,mTTAdNative).preprearToShowGameInfo(ADConstants.AD_OPEN_APP_TIMER, id, startScore, endScore, isRight, quesiton_id, gameHtmlInfo).setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
             @Override
             public void getGoldDouble(int task_type, String pk) {
 
@@ -1234,7 +1237,9 @@ private RequestManager mRequestManager;
 
     private void showNextTimeDialog(long nextTime) {
 
-        AdDialog adDialog = new AdDialog(this).builder().prepareToShowNextTime(nextTime * 1000, new OnAdDialogClickListener() {
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(this);
+        final AdDialog adDialog =  AdDialog.builder(this,mTTAdNative).prepareToShowNextTime(nextTime * 1000, new OnAdDialogClickListener() {
             @Override
             public void onPositiveClick() {
                 //跳转限时领取
@@ -1250,7 +1255,9 @@ private RequestManager mRequestManager;
         if(isFinishing()){
             return;
         }
-        final AdDialog adDialog = new AdDialog(this).builder().prepareToShowLimitDialog(ADConstants.AD_OPEN_APP_TIMER).setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(this);
+        final AdDialog adDialog =  AdDialog.builder(this,mTTAdNative).prepareToShowLimitDialog(ADConstants.AD_OPEN_APP_TIMER).setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
             @Override
             public void getGoldDouble(int task_type, String pk) {
 
@@ -1286,7 +1293,9 @@ private RequestManager mRequestManager;
      */
     private void showExchangeData(int allMoney, int todayMoney, int ratio) {
 
-        final AdDialog adDialog = new AdDialog(this).builder().prepareToShowExchangeCoin(allMoney, todayMoney, ratio, new OnAdDialogClickListener() {
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(this);
+        final AdDialog adDialog =  AdDialog.builder(this,mTTAdNative).prepareToShowExchangeCoin(allMoney, todayMoney, ratio, new OnAdDialogClickListener() {
             @Override
             public void onPositiveClick() {
                 //兑换现金
@@ -1346,7 +1355,9 @@ private RequestManager mRequestManager;
      */
     private void showCheckInDialog(int signDay, int score, int task_type) {
 
-        final AdDialog adDialog = new AdDialog(this).builder().setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(this);
+        final AdDialog adDialog =  AdDialog.builder(this,mTTAdNative).setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
             @Override
             public void getGoldDouble(int task_type, String pk) {
 

app/src/main/java/com/kuxuan/moneynote/ui/fragments/NewsFragment.java

@@ -1188,7 +1188,9 @@ public class NewsFragment extends BaseFragment {
     AdDialog adDialog;
 
     private void showGoldDialog(String coin, final int position) {
-        adDialog = new AdDialog(getActivity()).builder().setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(getActivity());
+          adDialog =  AdDialog.builder(getActivity(),mTTAdNative).setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
             @Override
             public void getGoldDouble(int task_type, String pk) {
 

app/src/main/java/com/kuxuan/moneynote/ui/fragments/details/DetialFragment.java

@@ -655,28 +655,27 @@ public class DetialFragment extends MVPFragment<DetialPresent, DetialModel> impl
      * 展示定时任务弹窗
      */
     private void showTimerDialog(String money, long seconds) {
-
-        timeAdDialog = new AdDialog(getActivity()).builder().setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
-            @Override
-            public void getGoldDouble(int task_type, String pk) {
-                Intent intent = new Intent(getActivity(), FullSreenVideoActivity.class);
-                intent.putExtra(FullSreenVideoActivity.TASK_TYPE, task_type);
-                intent.putExtra(FullSreenVideoActivity.PK, pk);
-                startActivityForResult(intent, FullSreenVideoActivity.REQUEST_CODE);
-
-            }
-
-            @Override
-            public void onGoldGetSuccess() {
-                EventBus.getDefault().post(new GoldGetForNetEvent());
-                getGoldTimerTask(false);
-            }
-
-            @Override
-            public void onDialogDismiss() {
-
-            }
-        }).prepareToShowTimer(ADConstants.AD_OPEN_APP_TIMER, money, seconds, 2);
+//        timeAdDialog = AdDialog.builder(getActivity(),).setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
+//            @Override
+//            public void getGoldDouble(int task_type, String pk) {
+//                Intent intent = new Intent(getActivity(), FullSreenVideoActivity.class);
+//                intent.putExtra(FullSreenVideoActivity.TASK_TYPE, task_type);
+//                intent.putExtra(FullSreenVideoActivity.PK, pk);
+//                startActivityForResult(intent, FullSreenVideoActivity.REQUEST_CODE);
+//
+//            }
+//
+//            @Override
+//            public void onGoldGetSuccess() {
+//                EventBus.getDefault().post(new GoldGetForNetEvent());
+//                getGoldTimerTask(false);
+//            }
+//
+//            @Override
+//            public void onDialogDismiss() {
+//
+//            }
+//        }).prepareToShowTimer(ADConstants.AD_OPEN_APP_TIMER, money, seconds, 2);
 
     }
 

app/src/main/java/com/kuxuan/moneynote/ui/fragments/goldtab/GoldFragment.java

@@ -38,10 +38,12 @@ import com.bumptech.glide.load.resource.drawable.GlideDrawable;
 import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
+import com.bytedance.sdk.openadsdk.TTAdNative;
 import com.kuxuan.moneynote.MyApplication;
 import com.kuxuan.moneynote.R;
 import com.kuxuan.moneynote.ad.ADConstants;
 import com.kuxuan.moneynote.ad.AdDialog;
+import com.kuxuan.moneynote.ad.TTAdManagerHolder;
 import com.kuxuan.moneynote.api.ExceptionHandle;
 import com.kuxuan.moneynote.api.MyObsever;
 import com.kuxuan.moneynote.api.RetrofitClient;
@@ -314,7 +316,7 @@ public class GoldFragment extends BaseFragment {
                     //直接下载
                     try {
 //                        DownLoadManager.downLoadForNoMsg(getActivity(), gameGoldInfo.getUrl());
-                        DownLoadManager.getInstance().download(gameGoldInfo.getUrl(),"download.apk");
+                        DownLoadManager.getInstance().download(gameGoldInfo.getUrl(), "download.apk");
 //                        try {
 //                            Uri uri = Uri.parse(gameGoldInfo.getUrl());
 //                            Intent url_intent = new Intent(Intent.ACTION_VIEW,uri);
@@ -325,12 +327,12 @@ public class GoldFragment extends BaseFragment {
                     } catch (Exception e) {
 
                     }
-                } else if(gameGoldInfo.getLink_type()==3) {
+                } else if (gameGoldInfo.getLink_type() == 3) {
                     //跳转阅读赚钱
 //                    startActivity();
                     MobclickAgent.onEvent(getActivity(), "tab_news");
                     startActivityForResult(new Intent(getActivity(), NewsFindActivity.class), Constant.Code_Request.REQUESTCODE);
-                }else {
+                } else {
                     if (TextUtils.isEmpty(gameGoldInfo.getId())) {
                         intent.putExtra("isThirdGame", true);
                     } else {
@@ -595,6 +597,7 @@ public class GoldFragment extends BaseFragment {
     private int mTodayMoney;
     private int ratio;
 
+    private TTAdNative mTTAdNative;
 
     /**
      * 弹出兑换现金弹窗
@@ -604,7 +607,9 @@ public class GoldFragment extends BaseFragment {
 //            isRunning = false;
 //            return;
 //        }
-        final AdDialog adDialog = new AdDialog(getActivity()).builder().prepareToShowExchangeCoin(mAllMoney, mTodayMoney, ratio, new OnAdDialogClickListener() {
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(getActivity());
+        AdDialog adDialog = AdDialog.builder(getActivity(), mTTAdNative).prepareToShowExchangeCoin(mAllMoney, mTodayMoney, ratio, new OnAdDialogClickListener() {
             @Override
             public void onPositiveClick() {
                 //兑换现金
@@ -638,7 +643,6 @@ public class GoldFragment extends BaseFragment {
             @Override
             public void onDismiss(DialogInterface dialog) {
                 isRunning = false;
-
             }
         });
     }
@@ -801,8 +805,9 @@ public class GoldFragment extends BaseFragment {
             isRunning = false;
             return;
         }
-
-        final AdDialog adDialog = new AdDialog(getActivity()).builder().prepareToShowMyMoney(ADConstants.AD_OPEN_APP_TIMER, allMoney, currentMoney);
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(getActivity());
+        final AdDialog adDialog =  AdDialog.builder(getActivity(),mTTAdNative).prepareToShowMyMoney(ADConstants.AD_OPEN_APP_TIMER, allMoney, currentMoney);
         adDialog.getmAdDialog().setOnDismissListener(new DialogInterface.OnDismissListener() {
             @Override
             public void onDismiss(DialogInterface dialog) {
@@ -877,7 +882,9 @@ public class GoldFragment extends BaseFragment {
             isRunning = false;
             return;
         }
-        AdDialog adDialog = new AdDialog(getActivity()).builder().prepareToShowNextTime(nextTime, new OnAdDialogClickListener() {
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(getActivity());
+        final AdDialog adDialog =  AdDialog.builder(getActivity(),mTTAdNative).prepareToShowNextTime(nextTime, new OnAdDialogClickListener() {
             @Override
             public void onPositiveClick() {
                 //跳转限时领取
@@ -901,7 +908,9 @@ public class GoldFragment extends BaseFragment {
             isRunning = false;
             return;
         }
-        final AdDialog adDialog = new AdDialog(getActivity()).builder().prepareToShowLimitDialog(ADConstants.AD_OPEN_APP_TIMER).setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(getActivity());
+        final AdDialog adDialog =  AdDialog.builder(getActivity(),mTTAdNative).prepareToShowLimitDialog(ADConstants.AD_OPEN_APP_TIMER).setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
             @Override
             public void getGoldDouble(int task_type, String pk) {
 
@@ -975,7 +984,9 @@ public class GoldFragment extends BaseFragment {
             isRunning = false;
             return;
         }
-        final AdDialog adDialog = new AdDialog(getActivity()).builder().setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
+        if (mTTAdNative == null)
+            mTTAdNative = TTAdManagerHolder.get().createAdNative(getActivity());
+        final AdDialog adDialog =  AdDialog.builder(getActivity(),mTTAdNative).setOnGoldGetListener(new AdDialog.OnGoldGetListener() {
             @Override
             public void getGoldDouble(int task_type, String pk) {
 

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

@@ -24,6 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="10dp"
+            android:layout_centerHorizontal="true"
             android:layout_alignParentBottom="true"
             android:scaleType="centerInside"
             android:src="@mipmap/icon_close_white" />

build.gradle

@@ -31,8 +31,8 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 ext {
-    versionCode = 49
-    versionName = "2.2.3"
+    versionCode = 50
+    versionName = "2.2.4"
     minSdkVersion = 19
     targetSdkVersion = 28
     compileSdkVersion = 28

kuxuanactivitymd/src/main/java/com/xieshengqi/kuxuanactivitymd/util/DisplayUtil.java

@@ -139,6 +139,7 @@ public class DisplayUtil {
 
     private static void checkInit() {
         if (metrics == null) {
+
             throw new NullPointerException("Place init DisplayUtil");
         }
     }