增加链接下载功能，发布2.1.9版本，版本号45

app/build.gradle

@@ -215,14 +215,18 @@ dependencies {
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.6'
 
 
-
     implementation 'com.alibaba:fastjson:1.2.54'
     implementation 'com.alibaba:fastjson:1.1.70.android'
- implementation 'com.android.support:multidex:1.0.0'
+    implementation 'com.android.support:multidex:1.0.0'
 
     //数据库依赖
     implementation 'org.greenrobot:greendao-generator:3.2.2'
     implementation 'org.greenrobot:greendao:3.2.2'
     implementation 'com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.0.2'
+//下载工具类
+    implementation 'com.allenliu.versionchecklib:library:2.2.0'
+
+    implementation 'com.liulishuo.filedownloader:library:1.7.6'
+
 
 }

app/proguard-rules.pro

@@ -468,4 +468,12 @@ public static java.lang.String TABLENAME;
 -keep class com.huawei.updatesdk.**{*;}
 -keep class com.huawei.hms.**{*;}
 
--keep class com.huawei.android.hms.agent.**{*;}
+-keep class com.huawei.android.hms.agent.**{*;}
+
+
+#下载工具类
+-keepattributes Annotation
+   -keepclassmembers class * {    @org.greenrobot.eventbus.Subscribe ;}
+   -keep enum org.greenrobot.eventbus.ThreadMode { *; }
+   -keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {    (java.lang.Throwable);}
+   -keep class com.allenliu.versionchecklib.**{*;}

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

@@ -134,30 +134,39 @@ public class SplashActivity extends FragmentActivity implements WeakHandler.IHan
             getChannleStatus(false);
             goToMainActivity();
         } else {
-            //step2:创建TTAdNative对象
-            mTTAdNative = TTAdManagerHolder.get().createAdNative(this);
-            //在合适的时机申请权限，如read_phone_state,防止获取不了imei时候，下载类广告没有填充的问题
-            //在开屏时候申请不太合适，因为该页面倒计时结束或者请求超时会跳转，在该页面申请权限，体验不好
-            // TTAdManagerHolder.getInstance(this).requestPermissionIfNecessary(this);
+
+
             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();
 //            }
-            loadSplashAd();
+//
             getChannleStatus(false);
 
         }
     }
 
-    private void loadLocationAd(){
-        String imageurl = (String) SPUtil.get(this,Constant.System.IMAGE_URL,"");
-        Glide.with(this).load(imageurl).into(new SimpleTarget<GlideDrawable>() {
+    /**
+     * 加载自己的广告
+     */
+    private void loadLocationAd() {
+        //获取保存的url
+        String imageUrl = (String) SPUtil.get(this, Constant.System.IMAGE_URL, "");
+        final String linkUrl = (String) SPUtil.get(this, Constant.System.LINK_URL, "");
+        Glide.with(this).load(imageUrl).into(new SimpleTarget<GlideDrawable>() {
             @Override
             public void onResourceReady(GlideDrawable resource, GlideAnimation<? super GlideDrawable> glideAnimation) {
                 //加载完成后的处理
@@ -168,7 +177,6 @@ public class SplashActivity extends FragmentActivity implements WeakHandler.IHan
                 //把SplashView 添加到ViewGroup中,注意开屏广告view：width >=70%屏幕宽；height >=50%屏幕宽
                 ImageView imageView = (ImageView) getImageView(resource);
                 mSplashContainer.addView(imageView);
-
 //添加一个自定义倒计时功能
                 mSplashContainer.addView(getCountTimeView());
                 imageView.setOnClickListener(new View.OnClickListener() {
@@ -177,20 +185,20 @@ public class SplashActivity extends FragmentActivity implements WeakHandler.IHan
                         //跳转链接
                         isClickAd = true;
                         Intent intent = new Intent(SplashActivity.this, WebviewActivity.class);
-                        intent.putExtra(WebviewActivity.TITLE,"ceshi");
-                        intent.putExtra(WebviewActivity.URL,"https://www.baidu.com");
+                        intent.putExtra(WebviewActivity.TITLE, "广告");
+                        intent.putExtra(WebviewActivity.URL, linkUrl);
                         startActivity(intent);
 
                     }
                 });
             }
-        } );
+        });
 
-}
+    }
 
     private View getImageView(GlideDrawable resource) {
         ImageView imageView = new ImageView(this);
-        FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,FrameLayout.LayoutParams.MATCH_PARENT);
+        FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.MATCH_PARENT);
         imageView.setScaleType(ImageView.ScaleType.FIT_XY);
         imageView.setLayoutParams(layoutParams);
         imageView.setImageDrawable(resource);
@@ -276,9 +284,9 @@ public class SplashActivity extends FragmentActivity implements WeakHandler.IHan
         RetrofitClient.getApiService().getAdstatus().subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BaseJson<AdStatus>>() {
             @Override
             public void onError(ExceptionHandle.ResponeThrowable e) {
-if(isGomain){
-    goToMainActivity();
-}
+                if (isGomain) {
+                    goToMainActivity();
+                }
             }
 
             @Override
@@ -287,7 +295,7 @@ if(isGomain){
                     if (!SplashActivity.this.isFinishing())
                         AdStatusManager.getInstance(SplashActivity.this).setAdStatus(adStatusBaseJson.getData());
                 }
-                if(isGomain){
+                if (isGomain) {
                     goToMainActivity();
                 }
             }
@@ -309,7 +317,7 @@ if(isGomain){
     @Override
     protected void onStop() {
         super.onStop();
-        Log.e("splashActivity","stop");
+        Log.e("splashActivity", "stop");
         mForceGoMain = true;
     }
 
@@ -370,10 +378,10 @@ if(isGomain){
                         Log.e(TAG, "onAdClicked");
 //                        showToast("开屏广告点击");
 //                        goToMainActivity();
-                        if(ad.getInteractionType() == TTAdConstant.INTERACTION_TYPE_DOWNLOAD){
+                        if (ad.getInteractionType() == TTAdConstant.INTERACTION_TYPE_DOWNLOAD) {
                             //下载类广告直接不处理
                             isClickAd = false;
-                        }else{
+                        } else {
                             isClickAd = true;
                         }
 
@@ -407,6 +415,7 @@ if(isGomain){
 
     /**
      * 自定义倒计时
+     *
      * @return
      */
     private View getCountTimeView() {
@@ -428,10 +437,10 @@ if(isGomain){
         CountDownTimer countDownTimer = new CountDownTimer(4000, 1000) {
             @Override
             public void onTick(long millisUntilFinished) {
-                Log.e("millisUntilFinished",millisUntilFinished+"");
+                Log.e("millisUntilFinished", millisUntilFinished + "");
                 tv_count.setText(millisUntilFinished / 1000 + "s");
-                if(millisUntilFinished / 1000==1){
-                    if(!isClickAd&&!SplashActivity.this.isFinishing())
+                if (millisUntilFinished / 1000 == 1) {
+                    if (!isClickAd && !SplashActivity.this.isFinishing())
                         goToMainActivity();
                 }
 
@@ -440,7 +449,7 @@ if(isGomain){
 
             @Override
             public void onFinish() {
-                Log.e("millisUntilFinished","onFinish");
+                Log.e("millisUntilFinished", "onFinish");
 
             }
         };
@@ -472,7 +481,6 @@ if(isGomain){
     }
 
 
-
     private void showToast(String msg) {
         TToast.show(this, msg);
     }
@@ -496,7 +504,8 @@ if(isGomain){
             initDB(true);
         }
     }
-//private  long time = 0;
+
+    //private  long time = 0;
     private void initDB(final boolean goMain) {
 //        time = System.currentTimeMillis();
         //首次进去添加类别数据库
@@ -582,7 +591,7 @@ if(isGomain){
         BillCategoreDaoOperator billCategoreDaoOperator = BillCategoreDaoOperator.newInstance();
         boolean haveData = billCategoreDaoOperator.isHaveData();
         if (haveData) {
-Log.e("BillCategoreDaoOperator","have");
+            Log.e("BillCategoreDaoOperator", "have");
         } else {
             String json = Tools.getJson("categore.txt", getApplicationContext());
 
@@ -687,7 +696,7 @@ Log.e("BillCategoreDaoOperator","have");
     @Override
     public void onPause() {
         super.onPause();
-        Log.e("onPause","onPause");
+        Log.e("onPause", "onPause");
         MobclickAgent.onPause(this);
     }
 }

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

@@ -31,6 +31,7 @@ import com.kuxuan.moneynote.json.UploadBeanJson;
 import com.kuxuan.moneynote.json.UserAllBillJson;
 import com.kuxuan.moneynote.json.UserCoinJson;
 import com.kuxuan.moneynote.json.UserJson;
+import com.kuxuan.moneynote.json.netbody.ADBody;
 import com.kuxuan.moneynote.json.netbody.Acticlebody;
 import com.kuxuan.moneynote.json.netbody.AliBody;
 import com.kuxuan.moneynote.json.netbody.AllCategoryBody;
@@ -766,6 +767,13 @@ public interface ApiService {
     @POST("V3/uploadUserPushToken")
     Observable<BaseJson<Object>> uploadUserPushToken(@Body PushTokenBody body);
 
+    /**
+     * 获取广告
+     * @return
+     */
+    @POST("Advert/V1/getAdvert")
+    Observable<Object> getAdvert(@Body ADBody aDbody);
+
 }
 
 

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

@@ -17,6 +17,53 @@ import okhttp3.logging.HttpLoggingInterceptor;
 public class MyOkClient {
     static OkHttpClient client;
     static OkHttpClient tokenclient;
+    static OkHttpClient adClient;
+
+
+    @NonNull
+    public static OkHttpClient getAdClient() {
+        if (adClient != null) {
+            return adClient;
+        }
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+//        if (AppConstants.sDebug) {
+        // Log信息拦截器
+        //          HttpLoggingInterceptor loggingInterceptorhead = new HttpLoggingInterceptor();
+        //          loggingInterceptorhead.setLevel(HttpLoggingInterceptor.Level.BODY);
+//            MyHttpLoggingInterceptor loggingInterceptorhead = new MyHttpLoggingInterceptor();
+//        if(AppConstants.sDebug){
+        CustormInterceptor loggingInterceptorhead = new CustormInterceptor();
+        loggingInterceptorhead.setLevel(CustormInterceptor.Level.BODY);
+        builder.addInterceptor(loggingInterceptorhead);
+//        }
+        builder.addInterceptor(new QueryParameterInterceptor());
+        builder.addInterceptor(new TokenInterceptor());
+//        }
+        //设置cookie
+        CookieManager cookieManager = new CookieManager();
+        cookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
+        builder.cookieJar(new JavaNetCookieJar(cookieManager));
+        //公共参数
+//        builder.addInterceptor(new QueryParameterInterceptor());
+        //Gzip压缩
+//        builder.addInterceptor(new GzipRequestInterceptor());
+        //开启缓存
+//        File cacheFile = new File(RockContextUtils.getApplicationContext().getExternalCacheDir(), "appCache");
+//        Cache cache = new Cache(cacheFile, 1024 * 1024 * 30);
+//        builder.cache(cache).addInterceptor(new CacheInterceptor());
+        //开启facebook sDebug
+//        builder.addNetworkInterceptor(new StethoInterceptor());
+        //设置超时
+        builder.connectTimeout(50, TimeUnit.SECONDS);
+        builder.readTimeout(50, TimeUnit.SECONDS);
+        builder.writeTimeout(50, TimeUnit.SECONDS);
+        //错误重连
+        builder.retryOnConnectionFailure(false);
+        adClient = builder.build();
+        return adClient;
+    }
+
+
 
     @NonNull
     public static OkHttpClient getOkHttpClient() {

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

@@ -29,11 +29,26 @@ public class RetrofitClient {
                 .build();
     }
 
+    /**
+     * 广告ad
+     * @return
+     */
+    public static Retrofit getAdRetrofit(){
+        Gson gson = MyGson.get();
+        OkHttpClient client = MyOkClient.getOkHttpClient();
+        return new Retrofit.Builder().baseUrl("http://ads.726p.com/api/")
+                .addConverterFactory(GsonConverterFactory.create(gson))
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .client(client)
+                .build();
+    }
+
     public static <T> T createApi(Class<T> clazz, Retrofit retrofit) {
         return retrofit.create(clazz);
     }
 
     private static ApiService mCCApiService;
+    private static ApiService mAdApiService;
 
     public static ApiService getApiService() {
         if (mCCApiService == null) {
@@ -41,6 +56,12 @@ public class RetrofitClient {
         }
         return mCCApiService;
     }
+    public static ApiService getAdApiService() {
+        if (mAdApiService == null) {
+            mAdApiService = createApi(ApiService.class, getAdRetrofit());
+        }
+        return mAdApiService;
+    }
 
     /**
      * 文件body

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

@@ -16,6 +16,7 @@ public class Constant {
 //    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 = "http://47.93.190.105:2796/api/";
     //获取token必须使用这个url
     public static final String TOKEN_BASE_URL = "https://apimoney.726p.com/api/";
     public static final String MD5 = "b4b80c2676828f1df375684100f56d48";
@@ -54,9 +55,11 @@ public class Constant {
         //任务列表引导页
         public static final String SWITCH_GOLD = "switch_gold";
         //广告展示
-        public static final String SWITCH_AD="switch_ad";
-        //自己的广告url
-        public static final String IMAGE_URL="image_url_ad";
+        public static final String SWITCH_AD = "switch_ad";
+        //自己的广告的图片url
+        public static final String IMAGE_URL = "image_url_ad";
+        //自己广告的跳转链接
+        public static final String LINK_URL = "link_url_ad";
         //默认预算
         public static final long NORMAL_NUM = 3000;
         public static final String CURRENT_YEAR = "current_year";
@@ -69,8 +72,8 @@ public class Constant {
 
         //当前缓存的金币数量
         public static final String CURRENT_GOLD = "current_gold";
-//首页打开设置
-        public static final String SWITCH_SETTING ="switch_setting" ;
+        //首页打开设置
+        public static final String SWITCH_SETTING = "switch_setting";
     }
 
     /**
@@ -251,4 +254,8 @@ public class Constant {
         public static final String PUSH_OPPO_NOTICEOPEN = "push_oppo_notice_open";
     }
 
+    public static class Download {
+        public static final String IS_DOWN = "is_down";
+    }
+
 }

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

@@ -23,6 +23,24 @@ public class GameGoldInfo {
     private String desc;
     private String button;
     private int top;
+    private int link_type;
+    private String apk_name;
+
+    public String getApk_name() {
+        return apk_name;
+    }
+
+    public void setApk_name(String apk_name) {
+        this.apk_name = apk_name;
+    }
+
+    public int getLink_type() {
+        return link_type;
+    }
+
+    public void setLink_type(int link_type) {
+        this.link_type = link_type;
+    }
 
     public String getUrl() {
         if(id!=null&&!id.equals("")){

app/src/main/java/com/kuxuan/moneynote/json/netbody/ADBody.java

@@ -0,0 +1,14 @@
+package com.kuxuan.moneynote.json.netbody;
+
+/**
+ * create by ${xieshengqi}
+ * create time 2019-08-20
+ */
+public class ADBody {
+
+    private String space_sign;
+
+    public ADBody(String space_sign) {
+        this.space_sign = space_sign;
+    }
+}

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

@@ -28,6 +28,8 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.allenliu.versionchecklib.callback.APKDownloadListener;
+import com.allenliu.versionchecklib.v2.callback.ForceUpdateListener;
 import com.androidquery.callback.AQuery2;
 import com.androidquery.callback.AjaxStatus;
 import com.androidquery.callback.BitmapAjaxCallback;
@@ -44,6 +46,7 @@ import com.bytedance.sdk.openadsdk.TTImage;
 import com.bytedance.sdk.openadsdk.TTNativeAd;
 
 import com.coloros.mcssdk.PushManager;
+import com.google.gson.Gson;
 import com.huawei.android.hms.agent.HMSAgent;
 import com.huawei.android.hms.agent.common.handler.ConnectHandler;
 import com.huawei.android.hms.agent.push.handler.GetTokenHandler;
@@ -54,8 +57,11 @@ import com.kuxuan.moneynote.SplashActivity;
 import com.kuxuan.moneynote.ad.ADConstants;
 import com.kuxuan.moneynote.ad.AdDialog;
 import com.kuxuan.moneynote.ad.TTAdManagerHolder;
+import com.kuxuan.moneynote.api.ApiService;
 import com.kuxuan.moneynote.api.ExceptionHandle;
+import com.kuxuan.moneynote.api.MyGson;
 import com.kuxuan.moneynote.api.MyObsever;
+import com.kuxuan.moneynote.api.MyOkClient;
 import com.kuxuan.moneynote.api.RetrofitClient;
 import com.kuxuan.moneynote.base.BaseFragmentActivity;
 import com.kuxuan.moneynote.common.Constant;
@@ -66,6 +72,7 @@ import com.kuxuan.moneynote.json.BaseJson;
 import com.kuxuan.moneynote.json.GlodJson;
 import com.kuxuan.moneynote.json.UploadBeanJson;
 import com.kuxuan.moneynote.json.UploadDbjson;
+import com.kuxuan.moneynote.json.netbody.ADBody;
 import com.kuxuan.moneynote.json.netbody.GlodBody;
 import com.kuxuan.moneynote.json.netbody.GoldHaveBody;
 import com.kuxuan.moneynote.listener.OnAdDialogClickListener;
@@ -93,8 +100,10 @@ import com.kuxuan.moneynote.ui.weight.CustormDialog;
 import com.kuxuan.moneynote.ui.weight.NavigationLayout;
 import com.kuxuan.moneynote.utils.ButtonUtils;
 import com.kuxuan.moneynote.utils.DisplayUtil;
+import com.kuxuan.moneynote.utils.DownLoadManager;
 import com.kuxuan.moneynote.utils.DrawableUtil;
 import com.kuxuan.moneynote.utils.LoginStatusUtil;
+import com.kuxuan.moneynote.utils.MyNotificationUtils;
 import com.kuxuan.moneynote.utils.NetWorkUtil;
 import com.kuxuan.moneynote.utils.PhoneUtil;
 import com.kuxuan.moneynote.utils.SPUtil;
@@ -111,6 +120,7 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -122,6 +132,10 @@ import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
+import okhttp3.OkHttpClient;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
 import social.milin.tech.mylove.DetailActivity;
 import social.milin.tech.mylove.utils.MyDialog;
 
@@ -145,7 +159,8 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
         super.onPause();
     }
 
-    private long time=0;
+    private long time = 0;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -182,40 +197,68 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
             });
         }
         GoldManager.getInstance().getUserCoin();
-//        Log.e("时间差",System.currentTimeMillis()-time+"");
+//        getSplashAd();
+    }
+
+    /**
+     * 获取开屏广告
+     */
+    private void getSplashAd() {
+//        final Gson gson = MyGson.get();
+//        OkHttpClient client = MyOkClient.getAdClient();
+//        Retrofit retrofit = new Retrofit.Builder().baseUrl("http://ads.726p.com/api/")
+//                .addConverterFactory(GsonConverterFactory.create(gson))
+//                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+//                .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>() {
+            @Override
+            public void onError(ExceptionHandle.ResponeThrowable e) {
+
+
+            }
+
+            @Override
+            public void onSuccess(Object o) {
+
+            }
+        });
+
     }
 
     /**
      * 打开oppo消息通知设置
      */
-    private void openNoticeSetting(){
-       boolean isOpen = (boolean) SPUtil.get(this, Constant.Push.PUSH_OPPO_NOTICEOPEN,false);
-       if(!isOpen){
-           boolean isOpenSetting = (boolean) SPUtil.get(this,Constant.System.SWITCH_SETTING,false);
-           if(isOpenSetting){
-               return;
-           }
-           SPUtil.putAndApply(this,Constant.System.SWITCH_SETTING,true);
+    private void openNoticeSetting() {
+        boolean isOpen = (boolean) SPUtil.get(this, Constant.Push.PUSH_OPPO_NOTICEOPEN, false);
+        if (!isOpen) {
+            boolean isOpenSetting = (boolean) SPUtil.get(this, Constant.System.SWITCH_SETTING, false);
+            if (isOpenSetting) {
+                return;
+            }
+            SPUtil.putAndApply(this, Constant.System.SWITCH_SETTING, true);
             CustormDialog custormDialog = new CustormDialog(this).builder().setTitle("提示").setMsg("请打开通知栏通知,方便接收消息提示").setNegativeButton("取消", new View.OnClickListener() {
-               @Override
-               public void onClick(View view) {
-
-               }
-           }).setPositiveButton("去设置", new View.OnClickListener() {
-               @Override
-               public void onClick(View view) {
-                   try {
-                       //防止出现没注册成功的时候，会抛出异常
-                   PushManager.getInstance().openNotificationSettings();
-                   }catch (Exception e){
-                   }
-               }
-           }).setCancelable(false);
+                @Override
+                public void onClick(View view) {
+
+                }
+            }).setPositiveButton("去设置", new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    try {
+                        //防止出现没注册成功的时候，会抛出异常
+                        PushManager.getInstance().openNotificationSettings();
+                    } catch (Exception e) {
+                    }
+                }
+            }).setCancelable(false);
             custormDialog.show();
 
-       }
+        }
 
     }
+
     /**
      * 开启推送，如果是华为需要连接
      */
@@ -235,7 +278,7 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
 //        }
         if (PhoneUtil.isEmui()) {
             startHuaweiPush();
-        }else if(PhoneUtil.isOppo()){
+        } else if (PhoneUtil.isOppo()) {
             openNoticeSetting();
         }
     }
@@ -273,6 +316,7 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
 
         });
     }
+
     Controller show;
 
     //初始化蒙版
@@ -617,7 +661,7 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
      * @param coin
      */
     public void updataGoldForNet(final int type, final String advert_id, final String coin) {
-        GoldManager.getInstance().getGoldForNet(MainActivity.this,type, advert_id, new OnGoldGetListener() {
+        GoldManager.getInstance().getGoldForNet(MainActivity.this, type, advert_id, new OnGoldGetListener() {
             @Override
             public void onGetSuccess(String coins) {
                 showDialogForGold(coins);
@@ -725,12 +769,12 @@ public class MainActivity extends BaseFragmentActivity implements MineFragment.o
                 MobclickAgent.onEvent(this, "tab_cashCheckIn");
                 fragment = mFragmensts[2];
                 if (fragment == null) {
-//                    boolean isOpen = (boolean) SPUtil.get(MainActivity.this, Constant.ChannelStatus.STATUS, false);
-//                    if (isOpen) {
-//                        mFragmensts[2] = new FindFragment();
-//                    } else {
+                    boolean isOpen = (boolean) SPUtil.get(MainActivity.this, Constant.ChannelStatus.STATUS, false);
+                    if (isOpen) {
+                        mFragmensts[2] = new FindFragment();
+                    } else {
                     mFragmensts[2] = new NewsFindFragment();
-//                    }
+                    }
 
 //                    mFragmensts[2] = new ReportSingleFragment();
                     getSupportFragmentManager().beginTransaction().add(R.id.activity_main_content, mFragmensts[2]).commitAllowingStateLoss();

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

@@ -9,6 +9,7 @@ import android.graphics.drawable.GradientDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -25,6 +26,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -72,10 +74,14 @@ import com.kuxuan.moneynote.ui.activitys.login.PhoneLoginActivity;
 import com.kuxuan.moneynote.ui.activitys.news.NewsWebActivity;
 import com.kuxuan.moneynote.ui.activitys.news.ScrollWebview;
 import com.kuxuan.moneynote.ui.activitys.wallet.WalletActivity;
+import com.kuxuan.moneynote.utils.DownLoadManager;
 import com.kuxuan.moneynote.utils.DrawableUtil;
 import com.kuxuan.moneynote.utils.LoginStatusUtil;
 import com.kuxuan.moneynote.utils.SPUtil;
 import com.kuxuan.moneynote.utils.UIHelper;
+import com.liulishuo.filedownloader.BaseDownloadTask;
+import com.liulishuo.filedownloader.FileDownloadListener;
+import com.liulishuo.filedownloader.FileDownloader;
 import com.umeng.analytics.MobclickAgent;
 
 import net.qiujuer.genius.ui.Ui;
@@ -100,10 +106,14 @@ import io.reactivex.schedulers.Schedulers;
 public class MoneyTaskFragmentActivity extends BaseFragmentActivity {
     @Bind(R.id.fragment_moneytask_webview)
     WebView mWebview;
+    @Bind(R.id.fragment_moneytask_third_webview)
+    WebView mWebview_third;
     @Bind(R.id.fragment_moneytask_ad_layout)
     LinearLayout ad_layout;
     @Bind({R.id.fragment_moneytask_layout})
     FrameLayout mRootView;
+    @Bind(R.id.fragment_moneytask_scrollView)
+    ScrollView scrollWebview;
 
     private BaseFragmentActivity activity;
     TTAdNative mTTAdNative;
@@ -114,12 +124,11 @@ public class MoneyTaskFragmentActivity extends BaseFragmentActivity {
     public static final String URL = "url";
 
 
-
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         onBaseCreate(savedInstanceState);
+        FileDownloader.setup(this);
     }
 
     //判断是不是第三方游戏
@@ -137,17 +146,72 @@ public class MoneyTaskFragmentActivity extends BaseFragmentActivity {
         TTAdManagerHolder.get().requestPermissionIfNecessary(activity);
         this.mAQuery = new AQuery2(activity);
         if (isThirdGame) {
-            ViewCalculateUtil.setViewLinearLayoutParam(findViewById(R.id.fragment_moneytask_layout), LinearLayout.LayoutParams.MATCH_PARENT, 800, 0, 0, 0, 0, true);
-            ad_layout.setVisibility(View.GONE);
-            ViewCalculateUtil.setViewFrameLayoutParam(mWebview, FrameLayout.LayoutParams.MATCH_PARENT, 800, 0, 0, 0, 0, true);
+            scrollWebview.setVisibility(View.GONE);
+            mWebview_third.setVisibility(View.VISIBLE);
+            initthirdView();
+            if (mLoadUrl != null)
+                mWebview_third.loadUrl(mLoadUrl);
         } else {
+            scrollWebview.setVisibility(View.VISIBLE);
+            mWebview_third.setVisibility(View.GONE);
             loadAd(ADConstants.AD_FULLSCREEN_VEDIEO, TTAdConstant.VERTICAL, false);
+            initWebView();
+            if (mLoadUrl != null)
+                mWebview.loadUrl(mLoadUrl);
         }
-        initWebView();
-        if (mLoadUrl != null)
-            mWebview.loadUrl(mLoadUrl);
-//            mWebview.loadUrl("http://182.92.118.1:8060/qianduo/games_h5/moveAgain.html?id=undefined");
-//            mWebview.loadUrl("http://192.168.22.39/other/qianduo/games_h5/rotateCircle.html?id=8");
+
+
+    }
+
+    private void initthirdView() {
+        WebSettings webSettings = mWebview_third.getSettings();
+        webSettings.setBuiltInZoomControls(true);
+        webSettings.setJavaScriptEnabled(true);
+        webSettings.setLoadWithOverviewMode(true);
+        webSettings.setAllowContentAccess(true);
+        webSettings.setUseWideViewPort(true);
+        mWebview_third.setInitialScale(57);
+        mWebview_third.addJavascriptInterface(new MyJs(this), "taskObj");
+//        test();
+        mWebview_third.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
+        //   支持弹窗式 显示 div
+        mWebview_third.getSettings().setDomStorageEnabled(true);
+        mWebview_third.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
+        mWebview_third.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
+        mWebview_third.getSettings().setLayoutAlgorithm(
+                WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
+        mWebview_third.getSettings().setSupportZoom(false);
+        mWebview_third.getSettings().setPluginState(WebSettings.PluginState.ON);
+        mWebview_third.getSettings().setLoadWithOverviewMode(true);
+
+//        //图片不显示问题
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+
+            mWebview_third.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        }
+        mWebview_third.getSettings().setBlockNetworkImage(false);
+//
+////        mWebview.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
+////        mWebview.getSettings().setSupportMultipleWindows(true);
+        mWebview_third.setWebViewClient(mClient);
+        mWebview_third.setDownloadListener(new DownloadListener() {
+            @Override
+            public void onDownloadStart(String s, String s1, String s2, String s3, long l) {
+//                Log.e("onDownloadStart",s+":"+s1+":"+s2+":"+s3);
+                DownLoadManager.downLoadForNoMsg(MoneyTaskFragmentActivity.this, s);
+//                try {
+//                    Uri uri = Uri.parse(s);
+//                    Intent intent = new Intent(Intent.ACTION_VIEW,uri);
+//                    startActivity(intent);
+//                }catch (Exception e){
+//
+//                }
+//                String path = Environment.getExternalStorageDirectory().getAbsolutePath() + "/test.apk";
+//                Log.e("path", path);
+//                downLoad(s, path);
+            }
+        });
+        mWebview_third.setWebChromeClient(new WebChromeClient());
     }
 
     @Override
@@ -160,12 +224,16 @@ public class MoneyTaskFragmentActivity extends BaseFragmentActivity {
             CookieManager cookieManager = CookieManager.getInstance(); // the singleton CookieManager instance
             cookieManager.removeAllCookie();// Removes all cookies.
             CookieSyncManager.getInstance().sync(); // forces sync manager to sync now
-
             mWebview.setWebChromeClient(null);
             mWebview.setWebViewClient(null);
             mWebview.getSettings().setJavaScriptEnabled(false);
             mWebview.clearCache(true);
-        }catch (Exception e){
+
+            mWebview_third.setWebChromeClient(null);
+            mWebview_third.setWebViewClient(null);
+            mWebview_third.getSettings().setJavaScriptEnabled(false);
+            mWebview_third.clearCache(true);
+        } catch (Exception e) {
 
         }
 
@@ -282,19 +350,64 @@ public class MoneyTaskFragmentActivity extends BaseFragmentActivity {
             @Override
             public void onDownloadStart(String s, String s1, String s2, String s3, long l) {
 //                Log.e("onDownloadStart",s+":"+s1+":"+s2+":"+s3);
-                try {
-                    Uri uri = Uri.parse(s);
-                    Intent intent = new Intent(Intent.ACTION_VIEW,uri);
-                    startActivity(intent);
-                }catch (Exception e){
-
-                }
-
+                DownLoadManager.downLoadForNoMsg(MoneyTaskFragmentActivity.this, s);
+//                try {
+//                    Uri uri = Uri.parse(s);
+//                    Intent intent = new Intent(Intent.ACTION_VIEW,uri);
+//                    startActivity(intent);
+//                }catch (Exception e){
+//
+//                }
+//                String path = Environment.getExternalStorageDirectory().getAbsolutePath() + "/test.apk";
+//                Log.e("path", path);
+//                downLoad(s, path);
             }
         });
         mWebview.setWebChromeClient(new WebChromeClient());
     }
 
+    private void downLoad(String url, String path) {
+        FileDownloader.getImpl().create(url)
+                .setPath(path)
+                .setListener(new FileDownloadListener() {
+                    @Override
+                    protected void pending(BaseDownloadTask task, int soFarBytes, int totalBytes) {
+                    }
+
+                    @Override
+                    protected void connected(BaseDownloadTask task, String etag, boolean isContinue, int soFarBytes, int totalBytes) {
+                    }
+
+                    @Override
+                    protected void progress(BaseDownloadTask task, int soFarBytes, int totalBytes) {
+                    }
+
+                    @Override
+                    protected void blockComplete(BaseDownloadTask task) {
+                    }
+
+                    @Override
+                    protected void retry(final BaseDownloadTask task, final Throwable ex, final int retryingTimes, final int soFarBytes) {
+                    }
+
+                    @Override
+                    protected void completed(BaseDownloadTask task) {
+                    }
+
+                    @Override
+                    protected void paused(BaseDownloadTask task, int soFarBytes, int totalBytes) {
+                    }
+
+                    @Override
+                    protected void error(BaseDownloadTask task, Throwable e) {
+                    }
+
+                    @Override
+                    protected void warn(BaseDownloadTask task) {
+                    }
+                }).start();
+    }
+
     View bg_view;
     TextView ad_content_text;
     ImageView adIcon_img;
@@ -630,9 +743,9 @@ public class MoneyTaskFragmentActivity extends BaseFragmentActivity {
         }
 
         @JavascriptInterface
-        public void checkAd(int width,int height){
-            if(isInit){
-                Log.e("h5","checkAd:");
+        public void checkAd(int width, int height) {
+            if (isInit) {
+                Log.e("h5", "checkAd:");
                 loadInteractionAd(ADConstants.AD_H5_GAME, width, height);
             }
 
@@ -742,27 +855,28 @@ public class MoneyTaskFragmentActivity extends BaseFragmentActivity {
          */
         @JavascriptInterface
         public void game_done(final int id, final int score, final boolean isRight, final int quesition_id) {
-            Log.e("h5","game_done:"+id+":"+score+":"+isRight+":"+quesition_id);
+            Log.e("h5", "game_done:" + id + ":" + score + ":" + isRight + ":" + quesition_id);
             //弹出全屏广告
             mWebview.post(new Runnable() {
                 @Override
                 public void run() {
-                    getDialogConfig(id, 0, score, isRight, quesition_id,1);
+                    getDialogConfig(id, 0, score, isRight, quesition_id, 1);
                 }
             });
         }
+
         /**
          * H5弹出游戏领取金币框
          */
         @JavascriptInterface
-        public void new_game_done(final int id, final int score, final boolean isRight, final int quesition_id,final int count) {
-           Log.e("h5","new_game_done:"+id+":"+score+":"+isRight+":"+quesition_id+":"+count);
+        public void new_game_done(final int id, final int score, final boolean isRight, final int quesition_id, final int count) {
+            Log.e("h5", "new_game_done:" + id + ":" + score + ":" + isRight + ":" + quesition_id + ":" + count);
             //弹出全屏广告
             mWebview.post(new Runnable() {
                 @Override
                 public void run() {
 
-                    getDialogConfig(id, 0, score, isRight, quesition_id,count);
+                    getDialogConfig(id, 0, score, isRight, quesition_id, count);
                 }
             });
 
@@ -814,6 +928,7 @@ public class MoneyTaskFragmentActivity extends BaseFragmentActivity {
 
     /**
      * 获取游戏配置
+     *
      * @param id
      * @param startScore
      * @param endScore
@@ -821,7 +936,7 @@ public class MoneyTaskFragmentActivity extends BaseFragmentActivity {
      * @param quesition_id
      * @param count
      */
-    private void getDialogConfig(final int id, final int startScore, final int endScore, final boolean isRight, final int quesition_id,final int count) {
+    private void getDialogConfig(final int id, final int startScore, final int endScore, final boolean isRight, final int quesition_id, final int count) {
         RetrofitClient.getApiService().getGameHtmlInfo(new GamePostBody(id, 1)).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BaseJson<GameHtmlInfo>>() {
             @Override
             public void onError(ExceptionHandle.ResponeThrowable e) {
@@ -831,7 +946,7 @@ public class MoneyTaskFragmentActivity extends BaseFragmentActivity {
             @Override
             public void onSuccess(BaseJson<GameHtmlInfo> glodJsonBaseJson) {
                 if (glodJsonBaseJson != null && glodJsonBaseJson.getCode() == Constant.Code_Request.SUCCESS_CODE) {
-                    showGameDialog(startScore, endScore, isRight, id, quesition_id, glodJsonBaseJson.getData(),count);
+                    showGameDialog(startScore, endScore, isRight, id, quesition_id, glodJsonBaseJson.getData(), count);
                 }
             }
         });
@@ -864,11 +979,11 @@ public class MoneyTaskFragmentActivity extends BaseFragmentActivity {
      * @param isRight
      * @param gameHtmlInfo
      */
-    private void showGameDialog(int startScore, int endScore, boolean isRight, int id, int quesiton_id, GameHtmlInfo gameHtmlInfo,final int count) {
+    private void showGameDialog(int startScore, int endScore, boolean isRight, int id, int quesiton_id, GameHtmlInfo gameHtmlInfo, final int count) {
         EventBus.getDefault().post(new GoldGetForNetEvent());
-if(this.isFinishing()){
-    return;
-}
+        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() {
             @Override
             public void getGoldDouble(int task_type, String pk) {
@@ -892,7 +1007,7 @@ if(this.isFinishing()){
 //                if (adDialog.isGetDoubleCoin()) {
 //                    reloadUrl();
 //                }
-                if(count%5==0){
+                if (count % 5 == 0) {
                     //展示限时领取的dialog
                     showLimitDialog();
                 }
@@ -1081,7 +1196,13 @@ if(this.isFinishing()){
         @Override
         public void onPageFinished(WebView view, String url) {
             activity.closeProgressDialog();
-            mWebview.setVisibility(View.VISIBLE);
+            if (isThirdGame) {
+
+                mWebview_third.setVisibility(View.VISIBLE);
+            } else {
+
+                mWebview.setVisibility(View.VISIBLE);
+            }
 //            ad_layout.setVisibility(View.VISIBLE);
 
         }

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

@@ -24,6 +24,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.allenliu.versionchecklib.callback.APKDownloadListener;
 import com.app.hubert.guide.NewbieGuide;
 import com.app.hubert.guide.core.Builder;
 import com.app.hubert.guide.core.Controller;
@@ -66,8 +67,10 @@ import com.kuxuan.moneynote.ui.fragments.MoneyTaskFragmentActivity;
 import com.kuxuan.moneynote.ui.view.CountDownTimeTextView;
 import com.kuxuan.moneynote.ui.weight.CustormFontsTextView;
 import com.kuxuan.moneynote.utils.ButtonUtils;
+import com.kuxuan.moneynote.utils.DownLoadManager;
 import com.kuxuan.moneynote.utils.DrawableUtil;
 import com.kuxuan.moneynote.utils.LoginStatusUtil;
+import com.kuxuan.moneynote.utils.MyNotificationUtils;
 import com.kuxuan.moneynote.utils.SPUtil;
 import com.kuxuan.moneynote.utils.ToastUtil;
 import com.kuxuan.moneynote.utils.UIHelper;
@@ -77,6 +80,7 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.io.File;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -85,7 +89,12 @@ import java.util.Map;
 import butterknife.Bind;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import io.reactivex.Observable;
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import pl.droidsonroids.gif.GifImageView;
 
@@ -277,6 +286,7 @@ public class GoldFragment extends BaseFragment {
 
     GoldAdapter mAdapter;
 
+
     private void initRecyclerView() {
         mAdapter = new GoldAdapter(getActivity());
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());
@@ -286,21 +296,31 @@ public class GoldFragment extends BaseFragment {
         mAdapter.setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(View view, int position) {
-
                 Intent intent = new Intent(getActivity(), MoneyTaskFragmentActivity.class);
                 GameGoldInfo gameGoldInfo = mAdapter.getmList().get(position);
-                if (TextUtils.isEmpty(gameGoldInfo.getId())) {
-                    intent.putExtra("isThirdGame", true);
+                if (gameGoldInfo.getLink_type() == 2) {
+                    //直接下载
+                    try {
+                        DownLoadManager.downLoadForNoMsg(getActivity(), gameGoldInfo.getUrl());
+                    } catch (Exception e) {
+
+                    }
+
                 } else {
-                    intent.putExtra("isThirdGame", false);
+                    if (TextUtils.isEmpty(gameGoldInfo.getId())) {
+                        intent.putExtra("isThirdGame", true);
+                    } else {
+                        intent.putExtra("isThirdGame", false);
+                    }
+                    intent.putExtra(MoneyTaskFragmentActivity.URL, mAdapter.getmList().get(position).getUrl());
+                    onEventUmeng(mAdapter.getmList().get(position).getTitle());
+                    startActivityForResult(intent, Constant.Code_Request.REQUESTCODE);
                 }
-                intent.putExtra(MoneyTaskFragmentActivity.URL, mAdapter.getmList().get(position).getUrl());
-                onEventUmeng(mAdapter.getmList().get(position).getTitle());
-                startActivityForResult(intent, Constant.Code_Request.REQUESTCODE);
             }
         });
     }
 
+
     Controller show;
 
 
@@ -513,23 +533,23 @@ public class GoldFragment extends BaseFragment {
     private void setUserCoin(UserCoinJson locaUserCoin) {
         if (locaUserCoin == null)
             return;
-        float startMoney =0;
-        try{
+        float startMoney = 0;
+        try {
             startMoney = Float.parseFloat(goldUserText.getText().toString());
-        }catch (Exception e){
+        } catch (Exception e) {
 
         }
-        float endMoney =0;
+        float endMoney = 0;
         try {
-            endMoney =   Float.parseFloat(locaUserCoin.getMoney());
-        }catch (Exception e){
+            endMoney = Float.parseFloat(locaUserCoin.getMoney());
+        } catch (Exception e) {
 
         }
-        if(startMoney==endMoney&&startMoney==0){
+        if (startMoney == endMoney && startMoney == 0) {
             goldUserText.setText("0");
-        }else{
+        } else {
 
-            moneyAnimation(startMoney,endMoney,goldUserText,"");
+            moneyAnimation(startMoney, endMoney, goldUserText, "");
         }
 //        goldUserText.setText(locaUserCoin.getMoney());
         goldUserAllText.setText(locaUserCoin.getGold());
@@ -610,7 +630,7 @@ public class GoldFragment extends BaseFragment {
             @Override
             public void onSuccess(BaseJson<Object> objectBaseJson) {
                 if (objectBaseJson != null && objectBaseJson.getCode() == Constant.Code_Request.SUCCESS_CODE) {
-                    ToastUtil.show(getActivity(),"兑换成功");
+                    ToastUtil.show(getActivity(), "兑换成功");
                     EventBus.getDefault().post(new GoldGetForNetEvent());
                     //跳转我的钱包
                     goToWallet(true);
@@ -642,15 +662,17 @@ public class GoldFragment extends BaseFragment {
             UIHelper.openActivityWithBundle(getActivity(), PhoneLoginActivity.class, bundle);
             return;
         }
-        if (isNeedRefresh){
+        if (isNeedRefresh) {
             getUserCoinInfo(true, false);
         }
         Intent itnent = new Intent(getActivity(), WalletActivity.class);
         itnent.putExtra("isGoFromMoney", true);
         startActivity(itnent);
     }
+
     DecimalFormat df = new DecimalFormat("0.00");
     ValueAnimator valueAnimator;
+
     /**
      * 金币滚动动画
      *
@@ -658,17 +680,17 @@ public class GoldFragment extends BaseFragment {
      * @param endScore
      */
     private void moneyAnimation(float startScore, float endScore, final TextView textView, final String indexString) {
-        if(startScore==endScore){
+        if (startScore == endScore) {
             return;
         }
-        if(valueAnimator!=null){
-            if(valueAnimator.isRunning()){
-valueAnimator.cancel();
+        if (valueAnimator != null) {
+            if (valueAnimator.isRunning()) {
+                valueAnimator.cancel();
             }
             valueAnimator.cancel();
-            valueAnimator .setFloatValues(startScore, endScore);
+            valueAnimator.setFloatValues(startScore, endScore);
             valueAnimator.start();
-        }else{
+        } else {
             valueAnimator = ValueAnimator.ofFloat(startScore, endScore);
             valueAnimator.setDuration(500);
             valueAnimator.setInterpolator(new LinearInterpolator());
@@ -702,12 +724,12 @@ valueAnimator.cancel();
                     if (glodJsonBaseJson.getData() != null) {
                         //展示定时任务弹窗
                         long time = 0;
-                        try{
-time = Long.parseLong(glodJsonBaseJson.getData().getSeconds());
-                        }catch (Exception e){
+                        try {
+                            time = Long.parseLong(glodJsonBaseJson.getData().getSeconds());
+                        } catch (Exception e) {
 
                         }
-                        time = time*1000;
+                        time = time * 1000;
                         setTImerCount(time, glodJsonBaseJson.getData().getCoin(), glodJsonBaseJson.getData().getDays(), isNeedShow);
                     } else {
                         isRunning = false;
@@ -785,7 +807,7 @@ time = Long.parseLong(glodJsonBaseJson.getData().getSeconds());
         if (time == 0) {
             goldCountdownText.setText("00:00");
             //弹出定时领红包金币框
-            GoldManager.getInstance().getGoldForNet(getActivity(),2, null, new OnGoldGetListener() {
+            GoldManager.getInstance().getGoldForNet(getActivity(), 2, null, new OnGoldGetListener() {
                 @Override
                 public void onGetSuccess(String coins) {
                     //弹出领取金币框

app/src/main/java/com/kuxuan/moneynote/utils/DownLoadManager.java

@@ -0,0 +1,119 @@
+package com.kuxuan.moneynote.utils;
+
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+
+import com.allenliu.versionchecklib.callback.APKDownloadListener;
+import com.allenliu.versionchecklib.v2.AllenVersionChecker;
+import com.allenliu.versionchecklib.v2.builder.DownloadBuilder;
+import com.allenliu.versionchecklib.v2.builder.NotificationBuilder;
+import com.allenliu.versionchecklib.v2.builder.UIData;
+import com.allenliu.versionchecklib.v2.callback.ForceUpdateListener;
+import com.kuxuan.moneynote.R;
+
+import java.io.File;
+
+/**
+ * 下载管理类
+ */
+public class DownLoadManager {
+
+
+    public static void downLoad(Context context, String url) {
+
+        DownloadBuilder downloadBuilder = AllenVersionChecker.getInstance().downloadOnly(UIData.create().setDownloadUrl(url).setTitle("ceshi").setContent("cessds"));
+        //是否显示通知栏
+        downloadBuilder.setShowNotification(true);
+        //是否静默下载
+        downloadBuilder.setSilentDownload(true);
+        //是否下载忽略本地缓存
+        downloadBuilder.setForceRedownload(true);
+        //是否显示下载失败框
+        downloadBuilder.setShowDownloadFailDialog(false);
+        downloadBuilder.setShowDownloadingDialog(false);
+        downloadBuilder.setApkDownloadListener(new APKDownloadListener() {
+            @Override
+            public void onDownloading(int progress) {
+                Log.e("download_progress", progress + "");
+            }
+
+            @Override
+            public void onDownloadSuccess(File file) {
+
+            }
+
+            @Override
+            public void onDownloadFail() {
+
+            }
+        });
+        downloadBuilder.executeMission(context);
+    }
+
+
+    /**
+     * 静默下载+直接安装
+     *
+     * @param context
+     * @param url
+     */
+    public static void downLoadForNoMsg(Context context, String url) {
+        ToastUtil.show(context, "正在下载");
+        DownloadBuilder builder = AllenVersionChecker.getInstance().downloadOnly(UIData.create().setDownloadUrl(url));
+        builder.setDirectDownload(true);
+        builder.setShowNotification(false);
+        builder.setShowDownloadingDialog(false);
+        builder.setShowDownloadFailDialog(false);
+        builder.setForceRedownload(false);
+        builder.executeMission(context);
+    }
+
+    /**
+     * 自定义下载监听
+     *
+     * @param context
+     * @param url
+     * @param downloadListener
+     */
+    public static void downLoadForNoticeation(Context context, String url, String apkName, String apk, APKDownloadListener downloadListener) {
+        ToastUtil.show(context, "正在下载");
+        DownloadBuilder builder = AllenVersionChecker.getInstance().downloadOnly(UIData.create().setDownloadUrl(url).setTitle("title").setContent("content"));
+        builder.setShowNotification(true);
+        NotificationBuilder notificationBuilder = NotificationBuilder.create();
+        notificationBuilder.setRingtone(true);
+        notificationBuilder.setContentTitle("下载任务");
+        notificationBuilder.setContentText(apkName);
+        notificationBuilder.setTicker("qianduo");
+        builder.setNotificationBuilder(notificationBuilder);
+        builder.setDirectDownload(true);
+        builder.setShowDownloadingDialog(false);
+        builder.setShowDownloadFailDialog(false);
+        builder.setApkName(apk);
+        builder.setApkDownloadListener(downloadListener);
+        builder.executeMission(context);
+
+    }
+
+    /**
+     * 更新版本
+     *
+     * @param context
+     * @param isForce 是否强制安装
+     * @param url
+     */
+    public static void updataVersion(Context context, boolean isForce, String url, ForceUpdateListener listener) {
+        DownloadBuilder builder = AllenVersionChecker.getInstance().downloadOnly(UIData.create().setDownloadUrl(url).setTitle("版本更新").setContent("有新版本发布，是否更新？"));
+        if (isForce) {
+            builder.setForceUpdateListener(listener);
+        }
+//        builder.setNotificationBuilder(NotificationBuilder.create().setIcon(R.mipmap.app_icon).setRingtone(true).setContentText("ss").setContentTitle("custormTitle").setTicker("ticker"));
+        builder.setForceRedownload(true);
+        builder.setShowDownloadingDialog(true);
+        builder.executeMission(context);
+
+    }
+
+}

app/src/main/java/com/kuxuan/moneynote/utils/MyNotificationUtils.java

@@ -0,0 +1,101 @@
+package com.kuxuan.moneynote.utils;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Build;
+import android.support.v4.app.NotificationCompat;
+
+import com.kuxuan.moneynote.R;
+
+/**
+ * 自定义通知栏
+ */
+public class MyNotificationUtils {
+
+    private String title;
+    private String content;
+    private int manageId;
+    private String channelId ;
+    private int currentProgress=0;
+    private int maxProgress =100;
+
+    private MyNotificationUtils(String title, String content, int manageId,String channelId) {
+        this.title = title;
+        this.content = content;
+        this.manageId = manageId;
+        this.channelId = channelId;
+    }
+
+    public static MyNotificationUtils newInstance( String title, String content, int manageId,String channelId){
+return new MyNotificationUtils(title,content,manageId,channelId);
+    }
+
+        private   NotificationManager getManager(Context  context) {
+        return (NotificationManager) context.getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);
+    }
+    private  NotificationCompat.Builder getNotificationBuilder(Context mContext, String title
+            , String content) {
+        //大于8.0
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            //id随便指定
+            NotificationChannel channel = new NotificationChannel(channelId
+                    , mContext.getPackageName(), NotificationManager.IMPORTANCE_DEFAULT);
+            channel.canBypassDnd();//可否绕过，请勿打扰模式
+            channel.enableLights(true);//闪光
+            channel.setLockscreenVisibility(Notification.VISIBILITY_SECRET);//锁屏显示通知
+            channel.setLightColor(Color.RED);//指定闪光是的灯光颜色
+            channel.canShowBadge();//桌面laucher消息角标
+            channel.enableVibration(true);//是否允许震动
+            channel.setSound(null, null);
+            //channel.getAudioAttributes();//获取系统通知响铃声音配置
+            channel.getGroup();//获取通知渠道组
+            channel.setBypassDnd(true);//设置可以绕过，请勿打扰模式
+            channel.setVibrationPattern(new long[]{100, 100, 200});//震动的模式，震3次，第一次100，第二次100，第三次200毫秒
+            channel.shouldShowLights();//是否会闪光
+            //通知管理者创建的渠道
+            getManager(mContext).createNotificationChannel(channel);
+
+        }
+
+        return new NotificationCompat.Builder(mContext,channelId).setAutoCancel(true)
+                .setContentTitle(title)
+                .setContentText(content).setSmallIcon(R.mipmap.ic_launcher);
+
+    }
+
+    /**
+     */
+    public  void showNotificationProgress(Context mContext) {
+        final NotificationCompat.Builder builder = getNotificationBuilder(mContext,title,content);
+       /* Intent intent = new Intent(this, SecondeActivity.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, 0);
+        builder.setContentIntent(pendingIntent);*/
+        builder.setOnlyAlertOnce(true);
+        builder.setDefaults(Notification.FLAG_ONLY_ALERT_ONCE);
+        builder.setProgress(maxProgress, currentProgress, false);
+        builder.setWhen(System.currentTimeMillis());
+        getManager(mContext).notify(manageId, builder.build());
+    }
+
+    /**
+     * 设置进度条
+     * @param mContext
+     * @param progress
+     */
+    public  void showNotificationProgressApkDown(Context mContext
+            , int progress) {
+         NotificationCompat.Builder builder = getNotificationBuilder(mContext,title,content);
+        builder.setOnlyAlertOnce(true);
+        builder.setDefaults(Notification.FLAG_ONLY_ALERT_ONCE);
+        builder.setProgress(maxProgress, progress, false);
+        builder.setWhen(System.currentTimeMillis());
+        getManager(mContext).notify(manageId, builder.build());
+    }
+
+    public  void cancleNotification(Context mContext,int manageId) {
+        getManager(mContext).cancel(manageId);
+    }
+}

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

@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:id="@+id/fragment_moneytasklayout"
+    android:layout_height="match_parent">
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+
+
+<ScrollView
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:scrollbars="none"
+    android:id="@+id/fragment_moneytask_scrollView"
     android:layout_height="match_parent">
 
     <LinearLayout
@@ -34,10 +43,18 @@
 
                 <include layout="@layout/layout_chuanshanjia_ad" />
             </LinearLayout>
-
-
         </FrameLayout>
     </LinearLayout>
 
 
-</ScrollView>
+</ScrollView>
+
+
+    <WebView
+        android:id="@+id/fragment_moneytask_third_webview"
+        android:layout_width="match_parent"
+        android:visibility="gone"
+        android:layout_height="match_parent" />
+
+
+</FrameLayout>

build.gradle

@@ -31,8 +31,8 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 ext {
-    versionCode = 43
-    versionName = "2.1.7"
+    versionCode = 45
+    versionName = "2.1.9"
     minSdkVersion = 19
     targetSdkVersion = 28
     compileSdkVersion = 28