升级百度自动更新SDK

WeiChat/build.gradle

@@ -146,6 +146,12 @@ android {
     }*/
 }
 
+repositories{
+    flatDir {
+        dirs 'libs'
+    }
+}
+
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile deps.junit
@@ -181,6 +187,8 @@ dependencies {
     compile project(':apputils')
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.android.support:support-v4:26.+'
+
+    compile(name: 'autoupdatesdk-release', ext: 'aar')
 }
 
 buildscript {

WeiChat/src/main/AndroidManifest.xml

@@ -535,23 +535,23 @@
             android:enabled="true"
             android:process=":remote" />
 
-        <activity
+       <!-- <activity
             android:name="com.baidu.autoupdatesdk.ConfirmDialoigActivity"
             android:configChanges="keyboardHidden|orientation"
             android:exported="false"
             android:screenOrientation="portrait"
-            android:theme="@style/bdp_update_dialog_style_fullscreen" />
+            android:theme="@style/bdp_update_dialog_style_fullscreen" />-->
 
-        <receiver
-            android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
-                <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
-                <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_AS" />
-                <action android:name="com.baidu.autoupdatesdk.ACTION_AS_DOWNLOAD_COMPLETE" />
-            </intent-filter>
-        </receiver>
+        <!--<receiver-->
+            <!--android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"-->
+            <!--android:exported="false">-->
+            <!--<intent-filter>-->
+                <!--<action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />-->
+                <!--<action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />-->
+                <!--<action android:name="com.baidu.autoupdatesdk.ACTION_NEW_AS" />-->
+                <!--<action android:name="com.baidu.autoupdatesdk.ACTION_AS_DOWNLOAD_COMPLETE" />-->
+            <!--</intent-filter>-->
+        <!--</receiver>-->
 
         <activity
             android:name=".video.VideoActivity" />
@@ -659,12 +659,12 @@
             android:name="UMENG_APPKEY"
             android:value="57ea27bb67e58e088c003bbf" />
         <!-- weixin -->
-        <activity
-            android:name="com.core.api.wxapi.WXEntryActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:exported="true"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+        <!--<activity-->
+            <!--android:name="com.core.api.wxapi.WXEntryActivity"-->
+            <!--android:configChanges="keyboardHidden|orientation|screenSize"-->
+            <!--android:exported="true"-->
+            <!--android:screenOrientation="portrait"-->
+            <!--android:theme="@android:style/Theme.Translucent.NoTitleBar" />-->
         <!-- qq -->
         <activity
             android:name="com.tencent.tauth.AuthActivity"
@@ -1056,6 +1056,19 @@
         </activity>
 
         <service android:name="com.core.service.InitializeService" />
+
+
+
+        <!-- android:authorities="包名.fileprovider"将“包名”替换为实际包名 -->
+        <provider
+            android:authorities="com.xzjmyk.pm.activity.fileprovider"
+            android:name="android.support.v4.content.FileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/bdp_update_filepaths"/>
+        </provider>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -15,7 +15,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
-import android.os.Messenger;
 import android.os.PersistableBundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
@@ -41,8 +40,10 @@ import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.baidu.android.pushservice.PushConstants;
 import com.baidu.android.pushservice.PushManager;
+import com.baidu.autoupdatesdk.AppUpdateInfo;
+import com.baidu.autoupdatesdk.AppUpdateInfoForInstall;
 import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
-import com.baidu.autoupdatesdk.UICheckUpdateCallback;
+import com.baidu.autoupdatesdk.CPCheckUpdateCallback;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
@@ -90,6 +91,7 @@ import com.uas.appme.pedometer.service.StepService;
 import com.uas.appme.pedometer.utils.StepCountCheckUtil;
 import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.settings.activity.FeedbackActivity;
+import com.uas.appme.settings.activity.SettingActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorkPlatFragment;
@@ -773,50 +775,28 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         }
         activity.getWindow().setAttributes(lp);
     }
+    
+    public class MyCPCheckUpdateCallback implements CPCheckUpdateCallback {
 
-    private Messenger messenger;
-    private Messenger mGetReplyMessenger = new Messenger(new Handler());
+        @Override
+        public void onCheckUpdateCallback(final AppUpdateInfo info, AppUpdateInfoForInstall infoForInstall) {
+            if (infoForInstall != null && !TextUtils.isEmpty(infoForInstall.getInstallPath())) {
+                BDAutoUpdateSDK.cpUpdateInstall(getApplicationContext(), infoForInstall.getInstallPath());
+            } else if (info != null) {
+                SettingActivity.showUpdateVersionPopup(MainActivity.this,info);
+            }
+        }
+    }
 
     public void updateVersion() {
-        BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
-            @Override
-            public void onCheckComplete() {
-               /* //发现新版本就初始化这个值保证下次“为UU评分”弹出，直至升级，对：就是这么流氓，叫你不升级我弹死你
-                BDAutoUpdateSDK.cpUpdateCheck(MainActivity.this,
-                        new CPCheckUpdateCallback() {
-
-                            @Override
-                            public void onCheckUpdateCallback(
-                                    AppUpdateInfo info,
-                                    AppUpdateInfoForInstall infoForInstall) {
-                                if (infoForInstall != null
-                                        && !TextUtils
-                                        .isEmpty(infoForInstall
-                                                .getInstallPath())) {
-                                    PreferenceUtils.putInt(MainActivity.NEW_VERSION_RATING, 0);
-                                } else if (info != null) {
-                                    PreferenceUtils.putInt(MainActivity.NEW_VERSION_RATING, 0);
-                                } else {
-//                                    ViewUtil.ShowMessageTitle(
-//                                            MainActivity.this,
-//                                            getString(R.string.set_isnewVersion));
-                                }
-                                progressDialog.dismiss();
-                            }
-                        });*/
-            }
-        });
-        Log.i("NEW_VERSION_RATING", PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_VERSION_RATING) + "");
+        BDAutoUpdateSDK.cpUpdateCheck(this, new MyCPCheckUpdateCallback());
     }
 
 
     private void doUserCheck() {
         if (!MyApplication.getInstance().isNetworkActive()) {
-//            if (mMessageFragment!=null)
-//            mMessageFragment.setNetNoticeVisiable(true);
             return;
         }
-//        if (mMessageFragment!=null) mMessageFragment.setNetNoticeVisiable(false);
         if (MyApplication.getInstance().mUserStatusChecked) {
             return;
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -774,10 +774,6 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         popupWindow.showAtLocation(ct.getWindow().getDecorView(), Gravity.CENTER, 0, 0);
-
-//        if (ViewUtil.mdProcessDialog!=null&&ViewUtil.mdProcessDialog.isShowing()){
-//            ViewUtil.mdProcessDialog.dismiss();
-//        }
     }
 
 

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Aug 01 18:17:59 CST 2018
-debugName=526
-versionName=639
-debugCode=526
-versionCode=180
+#Fri Aug 10 17:49:52 CST 2018
+debugName=568
+versionName=632
+debugCode=568
+versionCode=173

app_core/common/build.gradle

@@ -60,4 +60,5 @@ dependencies {
     compile project(':recyclerlibrary')
     compile files('libs/hellocharts-library-1.5.8.jar')
     compile deps.wechatSdk
+    compile 'com.github.hss01248:NotifyUtil:1.0.1'
 }

app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -25,6 +25,7 @@ import com.core.net.utils.NetUtils;
 import com.core.net.volley.FastVolley;
 import com.core.service.InitializeService;
 import com.core.utils.CommonUtil;
+import com.hss01248.notifyutil.NotifyUtil;
 import com.lidroid.xutils.HttpUtils;
 import com.nostra13.universalimageloader.cache.disc.impl.TotalSizeLimitedDiscCache;
 import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
@@ -106,6 +107,7 @@ public class MyApplication extends BaseApplication {
         mRequestQueue = Volley.newRequestQueue(this);
         mHttpUtils = new HttpUtils();
         configHttpUtils();
+     
         new Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -115,6 +117,8 @@ public class MyApplication extends BaseApplication {
                 initAppDir();
                 // 初始化图片加载
                 initImageLoader();
+                NotifyUtil.init(getInstance());
+               
             }
         }, 1);
 
@@ -214,11 +218,6 @@ public class MyApplication extends BaseApplication {
     }
 
     public boolean isNetworkActive() {
-//        if (mNetWorkObservable != null) {
-//            return mNetWorkObservable.isNetworkActive();
-//        }else{
-//	        return true;
-//        }
         return NetUtils.isNetWorkConnected(BaseConfig.getContext());
     }
 

app_modular/appme/build.gradle

@@ -18,14 +18,20 @@ android {
         }
     }
 }
+
+
+repositories{
+    flatDir {
+        dirs 'libs'
+    }
+}
 dependencies {
-    //project
     compile project(':common')
-//    compile project(':message')
     compile project(':appworks')
     compile project(':applogin')
     compile project(':appcontact')
-
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile project(path: ':appmusic')
+    compile(name: 'autoupdatesdk-release', ext: 'aar')
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+   
 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -1,6 +1,7 @@
 package com.uas.appme.settings.activity;
 
 import android.annotation.TargetApi;
+import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -20,6 +21,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
@@ -33,7 +35,7 @@ import com.baidu.autoupdatesdk.AppUpdateInfo;
 import com.baidu.autoupdatesdk.AppUpdateInfoForInstall;
 import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
 import com.baidu.autoupdatesdk.CPCheckUpdateCallback;
-import com.baidu.autoupdatesdk.UICheckUpdateCallback;
+import com.baidu.autoupdatesdk.CPUpdateDownloadCallback;
 import com.common.LogUtil;
 import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
@@ -41,6 +43,7 @@ import com.common.data.StringUtil;
 import com.common.file.FileUtils;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
+import com.common.system.SystemUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
@@ -53,11 +56,13 @@ import com.core.dao.work.WorkModelDao;
 import com.core.model.OAConfig;
 import com.core.model.WorkModel;
 import com.core.net.http.ViewUtil;
+import com.core.net.utils.NetUtils;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.LoginHelper;
 import com.core.utils.sp.UserSp;
 import com.core.widget.view.SwitchView;
+import com.hss01248.notifyutil.NotifyUtil;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -78,7 +83,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * 设置
  */
@@ -415,41 +419,63 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
         } else if (v.getId() == R.id.share_rl) {
             share();
         } else if (v.getId() == R.id.rl_app_update) {
-            dialog.setMessage(getString(R.string.set_check_update_wait));
-            dialog.show();
-            BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
-                @Override
-                public void onCheckComplete() {
-                    BDAutoUpdateSDK.cpUpdateCheck(SettingActivity.this,
-                            new CPCheckUpdateCallback() {
-
-                                @Override
-                                public void onCheckUpdateCallback(
-                                        AppUpdateInfo info,
-                                        AppUpdateInfoForInstall infoForInstall) {
-                                    if (infoForInstall != null
-                                            && !TextUtils
-                                            .isEmpty(infoForInstall
-                                                    .getInstallPath())) {
-                                    } else if (info != null) {
-                                    } else {
-//                                        ViewUtil.ShowMessageTitle(
-//                                                SettingActivity.this,
-//                                                getString(R.string.set_isnewVersion));
-                                        PopupWindowHelper.showAlart(SettingActivity.this,
-                                                getString(R.string.app_dialog_title), getString(R.string.set_isnewVersion)
-                                                , new PopupWindowHelper.OnSelectListener() {
-                                                    @Override
-                                                    public void select(boolean selectOk) {
-
-                                                    }
-                                                });
-                                    }
-                                    dialog.dismiss();
-                                }
-                            });
-                }
-            });
+            if (!NetUtils.isNetWorkConnected(MyApplication.getInstance())) {
+                ToastUtil.showToast(MyApplication.getInstance(), R.string.networks_out);
+            } else {
+                dialog.setMessage(getString(R.string.set_check_update_wait));
+                dialog.show();
+                
+                BDAutoUpdateSDK.cpUpdateCheck(this, new MyCPCheckUpdateCallback());
+//                BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
+//                    @Override
+//                    public void onNoUpdateFound() {
+//                        PopupWindowHelper.showAlart(SettingActivity.this,
+//                                getString(R.string.app_dialog_title), getString(R.string.set_isnewVersion)
+//                                , new PopupWindowHelper.OnSelectListener() {
+//                                    @Override
+//                                    public void select(boolean selectOk) {
+//                                      dialog.dismiss();
+//                                    }
+//                                });
+//                    }
+//
+//                    @Override
+//                    public void onCheckComplete() {
+//                        if (DialogUtils.isDialogShowing(dialog)){
+//                            dialog.dismiss();
+//                        }
+//                  BDAutoUpdateSDK.cpUpdateCheck(SettingActivity.this,
+//                                new CPCheckUpdateCallback() {
+//
+//                                    @Override
+//                                    public void onCheckUpdateCallback(
+//                                            AppUpdateInfo info,
+//                                            AppUpdateInfoForInstall infoForInstall) {
+//                                        if (infoForInstall != null
+//                                                && !TextUtils
+//                                                .isEmpty(infoForInstall
+//                                                        .getInstallPath())) {
+//                                            
+//                                        } else if (info != null) {
+//                                           
+//                                        } else {
+//                                            PopupWindowHelper.showAlart(SettingActivity.this,
+//                                                    getString(R.string.app_dialog_title), getString(R.string.set_isnewVersion)
+//                                                    , new PopupWindowHelper.OnSelectListener() {
+//                                                        @Override
+//                                                        public void select(boolean selectOk) {
+//
+//                                                        }
+//                                                    });
+//                                        }
+//                                      
+//                                    }
+//                                });
+//                        
+//                    }
+//                });
+            }
+
         } else if (v.getId() == R.id.super_setting_tv) {
             startActivityForResult(new Intent(mContext, SignSeniorSettingActivity.class), 0x12);
             closePopupWindow();
@@ -703,4 +729,123 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
         popupWindow.showAtLocation(activity.getWindow().getDecorView(), Gravity.CENTER, 0, 0);
     }
 
+
+    /**
+     * @desc:百度自动更新 下载回调
+     * @author：Arison on 2018/8/9
+     */
+    private static class UpdateDownloadCallback implements CPUpdateDownloadCallback {
+
+        @Override
+        public void onDownloadComplete(String apkPath) {
+            NotifyUtil.cancelAll();
+            BDAutoUpdateSDK.cpUpdateInstall(MyApplication.getInstance(), apkPath);
+        }
+
+        @Override
+        public void onStart() {
+
+        }
+
+        @Override
+        public void onPercent(int percent, long rcvLen, long fileSize) {
+            LogUtil.d("SettingActivity","percent:"+percent+"fileSize:"+Integer.valueOf(String.valueOf(fileSize))+" rcvLen："+rcvLen);
+            NotifyUtil.buildProgress(102,R.drawable.uuu,"正在下载,共"+byteToMb(fileSize),percent,100).show();
+        }
+
+        @Override
+        public void onFail(Throwable error, String content) {
+
+        }
+
+        @Override
+        public void onStop() {
+
+        }
+
+    }
+
+    private static  String byteToMb(long fileSize) {
+        float size = ((float) fileSize) / (1024f * 1024f);
+        return String.format("%.2fMB", size);
+    }
+
+
+    /**
+     * @desc:
+     * @author：Arison on 2018/8/9
+     */
+    public class MyCPCheckUpdateCallback implements CPCheckUpdateCallback {
+
+        @Override
+        public void onCheckUpdateCallback(final AppUpdateInfo info, AppUpdateInfoForInstall infoForInstall) {
+            if (infoForInstall != null && !TextUtils.isEmpty(infoForInstall.getInstallPath())) {
+                BDAutoUpdateSDK.cpUpdateInstall(getApplicationContext(), infoForInstall.getInstallPath());
+            } else if (info != null) {
+                showUpdateVersionPopup(SettingActivity.this,info);
+            } else {
+                PopupWindowHelper.showAlart(SettingActivity.this,
+                                getString(R.string.app_dialog_title), getString(R.string.set_isnewVersion)
+                                , new PopupWindowHelper.OnSelectListener() {
+                                    @Override
+                                    public void select(boolean selectOk) {
+                                      dialog.dismiss();
+                                    }
+                                });
+            }
+            dialog.dismiss();
+        }
 }
+
+
+    public static PopupWindow updatePopupWindow = null;
+    public static void  showUpdateVersionPopup(final Activity activity, final AppUpdateInfo info){
+        updatePopupWindow = null;
+        View view = null;
+        Button bt_update;
+        Button bt_noUpdate;
+        TextView tv_apkVersion;
+        TextView tv_update_content;
+        WindowManager windowManager = (WindowManager) activity.getSystemService(Context.WINDOW_SERVICE);
+        if (updatePopupWindow == null) {
+            LayoutInflater layoutInflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            view = layoutInflater.inflate(R.layout.pop_update_version, null);
+            bt_update=view.findViewById(R.id.bt_update);
+            bt_noUpdate=view.findViewById(R.id.bt_noUpdate);
+            tv_update_content=view.findViewById(R.id.tv_update_content);
+            tv_apkVersion=view.findViewById(R.id.tv_apkVersion);
+            tv_apkVersion.setText( SystemUtil.getVersionName(activity)+"-->v"+info.getAppVersionName()+"/"+byteToMb(info.getAppSize()));
+            tv_update_content.setText(info.getAppChangeLog());
+            bt_update.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    updatePopupWindow.dismiss();
+                    ToastUtil.showToast(MyApplication.getInstance(),"开始下载...");
+                    BDAutoUpdateSDK.cpUpdateDownload(activity, info, new UpdateDownloadCallback());
+                }
+            });
+
+            bt_noUpdate.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    updatePopupWindow.dismiss();
+                }
+            });
+            updatePopupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() - DensityUtil.dp2px(50), LinearLayout.LayoutParams.WRAP_CONTENT);
+        }
+        updatePopupWindow.setFocusable(true);
+        updatePopupWindow.setOutsideTouchable(true);
+        updatePopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(activity, 1f);
+            }
+        });
+        DisplayUtil.backgroundAlpha(activity, 0.5f);
+        updatePopupWindow.setBackgroundDrawable(new BitmapDrawable());
+        updatePopupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        updatePopupWindow.showAtLocation(activity.getWindow().getDecorView(), Gravity.CENTER, 0, 0);
+    }
+ 
+ 
+}

app_modular/appme/src/main/res/layout/pop_update_version.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" 
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/shape_border_withe">
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_border_bule"
+    android:padding="10dp">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:textColor="@color/white"
+        android:textStyle="bold"
+        android:textSize="18sp"
+        android:text="@string/app_find_version"/>
+    
+   <!-- <ImageView
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"/>-->
+
+</RelativeLayout>
+    <View style="@style/app_line_gray_1dp"></View> 
+    <TextView
+        android:id="@+id/tv_apkVersion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" 
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="@dimen/dp_10"
+        android:textSize="@dimen/sp_16"
+        android:textColor="@color/blue_seats_num"
+        android:text="V1.0-->V3.0 / 50.04MB"/>
+    
+    <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" 
+        android:layout_marginLeft="20dp"
+
+        android:layout_marginTop="@dimen/dp_10"
+    android:text="更新内容："/>
+
+    <TextView
+        android:id="@+id/tv_update_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/dp_40"
+        android:gravity="center_vertical"
+        android:layout_marginLeft="20dp"
+        android:layout_marginBottom="20dp"
+        android:layout_marginTop="@dimen/dp_10"
+        android:text="1：修复若干bug \n2：优化app性能\n2：**********\n2：**********"/>
+    
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="20dp">
+        <Button
+            android:id="@+id/bt_noUpdate"
+            android:layout_width="120dp"
+            android:layout_height="45dp" 
+            android:layout_marginLeft="30dp"
+            android:background="@drawable/selector_cancel_bg"
+            android:text="暂不升级"/>
+        <Button
+            android:id="@+id/bt_update"
+            android:layout_width="120dp"
+            android:layout_height="45dp"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="30dp"
+            android:textColor="@color/white"
+            android:background="@drawable/selector_confirm_bg"
+            android:text="升级下载"/>
+    </RelativeLayout>
+</LinearLayout>

app_modular/appme/src/main/res/values-en/strings.xml

@@ -1867,6 +1867,7 @@
 
     <string name="rest_date">休息时间</string>
     <string name="app_font_size_setting">字体大小设置</string>
+    <string name="app_find_version">发现新版本</string>
 
 
 </resources>

app_modular/appme/src/main/res/values/strings.xml

@@ -1867,6 +1867,7 @@
 
     <string name="rest_date">休息时间</string>
     <string name="app_font_size_setting">字体大小设置</string>
+    <string name="app_find_version">发现新版本</string>
 
 
 </resources>

app_third/libbdupdatesdk/build.gradle

@@ -17,8 +17,11 @@ android {
     }
 }
 
+
+
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile deps.junit
     compile deps.appcompatV7
+
 }

app_third/libbdupdatesdk/src/main/AndroidManifest.xml

@@ -36,26 +36,9 @@
         <!-- ↑↑↑ 百度移动统计SDK ↑↑↑ -->
         <!-- android:theme="@style/bdp_update_dialog_style_fullscreen" -->
 
-        <receiver
-            android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
-            android:exported="false" >
-            <intent-filter>
-                <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
-                <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
-                <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_AS" />
-                <action android:name="com.baidu.autoupdatesdk.ACTION_AS_DOWNLOAD_COMPLETE" />
-            </intent-filter>
-        </receiver>
+   
     </application>
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+
 
 </manifest>

build.gradle

@@ -6,6 +6,7 @@ buildscript {
         maven { url "https://jcenter.bintray.com" }
         maven { url "https://jitpack.io" }
         mavenCentral()
+    
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.2'
@@ -23,6 +24,8 @@ allprojects {
         maven {
             url 'https://maven.google.com'
         }
+        
+  
     }
 }