增加开屏页广告切换，是自己的广告还是穿山甲广告，修改友盟2.1.9版本的bug

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

@@ -139,21 +139,25 @@ public class SplashActivity extends FragmentActivity implements WeakHandler.IHan
             if (LoginStatusUtil.isLoginin()) {
                 sendData();
             }
-//            boolean isAD = (boolean) SPUtil.get(this, Constant.System.SWITCH_AD, false);
-//            isAD = true;
-//            if (isAD) {
-            //加载穿山甲开屏广告
-            //step2:创建TTAdNative对象
-            mTTAdNative = TTAdManagerHolder.get().createAdNative(this);
-            //在合适的时机申请权限，如read_phone_state,防止获取不了imei时候，下载类广告没有填充的问题
-            //在开屏时候申请不太合适，因为该页面倒计时结束或者请求超时会跳转，在该页面申请权限，体验不好
-            // TTAdManagerHolder.getInstance(this).requestPermissionIfNecessary(this);
-            loadSplashAd();
-//            } else {
-//                //加载自己的广告
-//                loadLocationAd();
-//            }
+            //广告位是否打开
+            boolean isOpenSplashAd = (boolean) SPUtil.get(this, Constant.System.SWITCH_SPLASH_AD, true);
+            if (isOpenSplashAd) {
+                boolean isAD = (boolean) SPUtil.get(this, Constant.System.SWITCH_AD, true);
+                isAD = false;
+                if (isAD) {
+                    //加载穿山甲开屏广告
+                    //step2:创建TTAdNative对象
+                    mTTAdNative = TTAdManagerHolder.get().createAdNative(this);
+                    //在合适的时机申请权限，如read_phone_state,防止获取不了imei时候，下载类广告没有填充的问题
+                    //在开屏时候申请不太合适，因为该页面倒计时结束或者请求超时会跳转，在该页面申请权限，体验不好
+                    // TTAdManagerHolder.getInstance(this).requestPermissionIfNecessary(this);
+                    loadSplashAd();
+                } else {
+                    //加载自己的广告
+                    loadLocationAd();
+                }
 //
+            }
             getChannleStatus(false);
 
         }
@@ -164,8 +168,11 @@ public class SplashActivity extends FragmentActivity implements WeakHandler.IHan
      */
     private void loadLocationAd() {
         //获取保存的url
-        String imageUrl = (String) SPUtil.get(this, Constant.System.IMAGE_URL, "");
+        final String imageUrl = (String) SPUtil.get(this, Constant.System.IMAGE_URL, "");
         final String linkUrl = (String) SPUtil.get(this, Constant.System.LINK_URL, "");
+        if(TextUtils.isEmpty(imageUrl)){
+            return;
+        }
         Glide.with(this).load(imageUrl).into(new SimpleTarget<GlideDrawable>() {
             @Override
             public void onResourceReady(GlideDrawable resource, GlideAnimation<? super GlideDrawable> glideAnimation) {
@@ -176,6 +183,9 @@ public class SplashActivity extends FragmentActivity implements WeakHandler.IHan
                 mSplashContainer.removeAllViews();
                 //把SplashView 添加到ViewGroup中,注意开屏广告view：width >=70%屏幕宽；height >=50%屏幕宽
                 ImageView imageView = (ImageView) getImageView(resource);
+                FrameLayout.LayoutParams p = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,FrameLayout.LayoutParams.MATCH_PARENT);
+                imageView.setLayoutParams(p);
+                imageView.setScaleType(ImageView.ScaleType.FIT_XY);
                 mSplashContainer.addView(imageView);
 //添加一个自定义倒计时功能
                 mSplashContainer.addView(getCountTimeView());

app/src/main/java/com/kuxuan/moneynote/api/ApiService.java

@@ -3,8 +3,10 @@ package com.kuxuan.moneynote.api;
 
 import com.kuxuan.moneynote.ad.AdStatus;
 import com.kuxuan.moneynote.json.ActivityJson;
+import com.kuxuan.moneynote.json.AdJson;
 import com.kuxuan.moneynote.json.AliPayInfo;
 import com.kuxuan.moneynote.json.BaseJson;
+import com.kuxuan.moneynote.json.BeanNewJson;
 import com.kuxuan.moneynote.json.BillJson;
 import com.kuxuan.moneynote.json.BindEmailStatus;
 import com.kuxuan.moneynote.json.CashConfigJson;
@@ -772,7 +774,7 @@ public interface ApiService {
      * @return
      */
     @POST("Advert/V1/getAdvert")
-    Observable<Object> getAdvert(@Body ADBody aDbody);
+    Observable<BeanNewJson<ArrayList<AdJson>>> getAdvert(@Body ADBody aDbody);
 
 }
 

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

@@ -11,11 +11,11 @@ public class Constant {
     //手机号正则，11位手机号
     public static final String REGEX_MOBILE = "[1][3,4,5,7,8][0-9]{9}$";
     //测试接口(没用报403)
-//    public static final String BASE_URL = "http://182.92.118.1:8060/api/";
+    public static final String BASE_URL = "http://182.92.118.1:8060/api/";
     //仿真环境
 //    public static final String BASE_URL = "http://develop.money.726p.com/api/";
     //线上环境
-    public static final String BASE_URL = "https://accountapi.726p.com/api/";
+//    public static final String BASE_URL = "https://accountapi.726p.com/api/";
 //    public static final String BASE_URL = "http://47.93.190.105:2796/api/";
     //获取token必须使用这个url
     public static final String TOKEN_BASE_URL = "https://apimoney.726p.com/api/";
@@ -60,6 +60,8 @@ public class Constant {
         public static final String IMAGE_URL = "image_url_ad";
         //自己广告的跳转链接
         public static final String LINK_URL = "link_url_ad";
+        //开屏广告位开关
+        public static final String SWITCH_SPLASH_AD = "switch_splash_ad";
         //默认预算
         public static final long NORMAL_NUM = 3000;
         public static final String CURRENT_YEAR = "current_year";

app/src/main/java/com/kuxuan/moneynote/json/AdJson.java

@@ -0,0 +1,72 @@
+package com.kuxuan.moneynote.json;
+
+import java.io.Serializable;
+
+/**
+ * create by ${xieshengqi}
+ * create time 2019-08-21
+ */
+public class AdJson implements Serializable {
+
+//    {
+//        "id": 1,
+//            "name": "老王",
+//            "advert_text": "",
+//            "img_url": "http://182.92.118.1:8070/laowana.png",
+//            "advert_url": "http://www.baidu.com"
+//    }
+    private int id;
+    private String name;
+    private String advert_text;
+    private String img_url;
+    private String advert_url;
+    private int advert_type;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAdvert_text() {
+        return advert_text;
+    }
+
+    public void setAdvert_text(String advert_text) {
+        this.advert_text = advert_text;
+    }
+
+    public String getImg_url() {
+        return img_url;
+    }
+
+    public void setImg_url(String img_url) {
+        this.img_url = img_url;
+    }
+
+    public String getAdvert_url() {
+        return advert_url;
+    }
+
+    public void setAdvert_url(String advert_url) {
+        this.advert_url = advert_url;
+    }
+
+    public int getAdvert_type() {
+        return advert_type;
+    }
+
+    public void setAdvert_type(int advert_type) {
+        this.advert_type = advert_type;
+    }
+}

app/src/main/java/com/kuxuan/moneynote/receiver/DownLoadReceiver.java

@@ -11,7 +11,7 @@ import android.content.Intent;
 public class DownLoadReceiver  extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        Intent i = new Intent(context, com.kuxuan.moneynote.servier.DownLoadService.class);
-        context.startService(i);
+//        Intent i = new Intent(context, com.kuxuan.moneynote.servier.DownLoadService.class);
+//        context.startService(i);
     }
 }

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

@@ -68,7 +68,9 @@ import com.kuxuan.moneynote.common.Constant;
 import com.kuxuan.moneynote.db.BillCategoreDaoOperator;
 import com.kuxuan.moneynote.db.CategoryDaoOperator;
 import com.kuxuan.moneynote.gold.GoldManager;
+import com.kuxuan.moneynote.json.AdJson;
 import com.kuxuan.moneynote.json.BaseJson;
+import com.kuxuan.moneynote.json.BeanNewJson;
 import com.kuxuan.moneynote.json.GlodJson;
 import com.kuxuan.moneynote.json.UploadBeanJson;
 import com.kuxuan.moneynote.json.UploadDbjson;
@@ -197,7 +199,7 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
             });
         }
         GoldManager.getInstance().getUserCoin();
-//        getSplashAd();
+        getSplashAd();
     }
 
     /**
@@ -212,7 +214,7 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
 //                .client(client)
 //                .build();
 //        ApiService apiService = retrofit.create(ApiService.class);
-       RetrofitClient.getAdApiService().getAdvert(new ADBody("22")).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<Object>() {
+        RetrofitClient.getAdApiService().getAdvert(new ADBody("22")).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BeanNewJson<ArrayList<AdJson>>>() {
             @Override
             public void onError(ExceptionHandle.ResponeThrowable e) {
 
@@ -220,7 +222,38 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
             }
 
             @Override
-            public void onSuccess(Object o) {
+            public void onSuccess(BeanNewJson<ArrayList<AdJson>> o) {
+                if (o != null && o.getCode() == 0) {
+                    ArrayList<AdJson> res = o.getRes();
+                    if (res != null && res.size() != 0) {
+                        AdJson adJson = res.get(0);
+                        if (adJson != null) {
+                            int advert_type = adJson.getAdvert_type();
+                            if (advert_type == 3) {
+                                //关闭广告
+                                SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.SWITCH_SPLASH_AD, false);
+                            } else {
+                                //打开广告
+                                SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.SWITCH_SPLASH_AD, true);
+                                if (advert_type == 1) {
+                                    //展示穿山甲广告
+                                    SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.SWITCH_AD, true);
+                                } else if (advert_type == 2) {
+                                    //展示自己的广告
+                                    SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.SWITCH_AD, false);
+                                    SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.IMAGE_URL, adJson.getImg_url());
+                                    SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.LINK_URL, adJson.getAdvert_url());
+                                }
+                            }
+
+
+                        }
+
+
+                    }
+
+
+                }
 
             }
         });
@@ -773,7 +806,7 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
                     if (isOpen) {
                         mFragmensts[2] = new FindFragment();
                     } else {
-                    mFragmensts[2] = new NewsFindFragment();
+                        mFragmensts[2] = new NewsFindFragment();
                     }
 
 //                    mFragmensts[2] = new ReportSingleFragment();

app/src/main/java/com/kuxuan/moneynote/ui/activitys/account/AccountActivity.java

@@ -733,6 +733,9 @@ public class AccountActivity extends MVPFragmentActivity<AccountPresenter, Accou
 
     @Override
     public void cateGoryClick(String category_id, int type, String icon_url, CategoryList categoryList) {
+        if(categoryList==null){
+            return;
+        }
         if (category_id.equals("0")) {
 
             return;

app/src/main/java/com/kuxuan/moneynote/ui/activitys/account/AccountPresenter.java

@@ -685,27 +685,30 @@ public class AccountPresenter extends AccountContract.AccountPresent {
         @Override
         public void onClick(CategoryList categoryList) {
             // TODO: 2018/8/10 点击选择的类别
-            if (categoryList.getId().equals("0")) {
-                if (LoginStatusUtil.isLoginin()) {
-                    if (view != null)
-                        view.goToEditCategory();
+            try {
+                if (categoryList.getId().equals("0")) {
+                    if (LoginStatusUtil.isLoginin()) {
+                        if (view != null)
+                            view.goToEditCategory();
+                    } else {
+                        Bundle bundle = new Bundle();
+                        bundle.putSerializable(PhoneLoginActivity.ACTIVITY_CLASS, CategoryActivity.class);
+                        UIHelper.openActivityWithBundle(mContext, PhoneLoginActivity.class, bundle);
+                    }
                 } else {
-                    Bundle bundle = new Bundle();
-                    bundle.putSerializable(PhoneLoginActivity.ACTIVITY_CLASS, CategoryActivity.class);
-                    UIHelper.openActivityWithBundle(mContext, PhoneLoginActivity.class, bundle);
-                }
-
-
-            } else {
-                if (view != null) {
-                    try {
-                        view.cateGoryClick(categoryList.getId(), categoryList.getType(), categoryList.getIcon(), categoryList);
-                        changeSelectCate(categoryList);
-                    }catch (Exception e){
+                    if (view != null) {
+                        try {
+                            view.cateGoryClick(categoryList.getId(), categoryList.getType(), categoryList.getIcon(), categoryList);
+                            changeSelectCate(categoryList);
+                        }catch (Exception e){
 
+                        }
                     }
                 }
+            }catch (Exception e){
+
             }
+
         }
     };
 

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

@@ -338,7 +338,6 @@ public class MoneyTaskFragmentActivity extends BaseFragmentActivity {
 
 //        //图片不显示问题
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
-
             mWebview.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
         mWebview.getSettings().setBlockNetworkImage(false);

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

@@ -1005,20 +1005,24 @@ public class DetialFragment extends MVPFragment<DetialPresent, DetialModel> impl
     }
 
     private void uploadPic(Bitmap bitmap) {
-        String imageFile = ImageUtil.savePhoto(bitmap, Environment
-                .getExternalStorageDirectory().getAbsolutePath(), String
-                .valueOf(System.currentTimeMillis()));
+        try{
+            String imageFile = ImageUtil.savePhoto(bitmap, Environment
+                    .getExternalStorageDirectory().getAbsolutePath(), String
+                    .valueOf(System.currentTimeMillis()));
+            File file = new File(imageFile);
+            if(file!=null){
+                GlideUtil.setImageWithNoCache(getContext(),file, iv_banner);
+                iv_banner.setBackgroundColor(DrawableUtil.getSkinColor(getActivity()));
+                SPUtil.putAndApply(getContext(), Constant.Skin.CHECKED, 1000);
+                SPUtil.putAndApply(getContext(), Constant.Skin.CUTPIC, imageFile);
+                SkinEvent skinEvent = new SkinEvent(1000);
+                EventBus.getDefault().post(skinEvent);
+            }
+        }catch (Exception e){
 
-        File file = new File(imageFile);
-        if(file!=null){
-            GlideUtil.setImageWithNoCache(getContext(),file, iv_banner);
-            iv_banner.setBackgroundColor(DrawableUtil.getSkinColor(getActivity()));
-            SPUtil.putAndApply(getContext(), Constant.Skin.CHECKED, 1000);
-            SPUtil.putAndApply(getContext(), Constant.Skin.CUTPIC, imageFile);
-            SkinEvent skinEvent = new SkinEvent(1000);
-            EventBus.getDefault().post(skinEvent);
         }
 
+
     }
 
     @Override

kuxuanactivitymd/src/main/java/com/xieshengqi/kuxuanactivitymd/api/ActivityFrameLayout.java

@@ -77,7 +77,7 @@ public class ActivityFrameLayout extends FrameLayout {
         mGifImageView.setLayoutParams(params);
         textViewParams.gravity = Gravity.CENTER;
         int margin = DisplayUtil.dip2px(10);
-        textViewParams.setMargins(margin,0,margin,0);
+        textViewParams.setMargins(margin, 0, margin, 0);
         textView.setLayoutParams(textViewParams);
         textView.setTextColor(Color.parseColor("#BF9400"));
         textView.setTextSize(12);