From 8a056273832018449b61e356683de41e3dbc7fdd Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Mon, 22 Jan 2018 16:03:26 +0800
Subject: [PATCH] no message

---
 app/build.gradle                              |  1 +
 app/src/main/AndroidManifest.xml              | 10 ++++
 .../com/qhclh/ytzh/home/MainActivity.java     | 50 +++++++++++++++----
 3 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d88e5a8..efc6434 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -79,4 +79,5 @@ dependencies {
 
     compile 'cn.jiguang.sdk:jpush:3.0.9'  // 此处以JPush 3.0.9 版本为例。
     compile 'cn.jiguang.sdk:jcore:1.1.7'  // 此处以JCore 1.1.7 版本为例。
+    compile 'com.teprinciple:updateapputils:1.4'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 75d74b8..46b3186 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -51,6 +51,16 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
         <activity
             android:name=".splash.SplashActivity"
             android:screenOrientation="portrait">
diff --git a/app/src/main/java/com/qhclh/ytzh/home/MainActivity.java b/app/src/main/java/com/qhclh/ytzh/home/MainActivity.java
index 3160000..1b660e0 100644
--- a/app/src/main/java/com/qhclh/ytzh/home/MainActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/home/MainActivity.java
@@ -3,6 +3,7 @@ package com.qhclh.ytzh.home;
 import android.Manifest;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Looper;
 import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.widget.Toolbar;
@@ -42,6 +43,7 @@ import butterknife.BindView;
 import butterknife.OnClick;
 import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.EasyPermissions;
+import util.UpdateAppUtils;
 
 public class MainActivity extends BaseActivity {
     @BindView(R.id.toolbar)
@@ -394,6 +396,7 @@ public class MainActivity extends BaseActivity {
 
 
     private static final int REQUEST_PERMISSION_CAMERA_CODE = 1021;
+    private static final int REQUEST_PERMISSION_CAMERA_CODE_W = 1022;
 
     @AfterPermissionGranted(REQUEST_PERMISSION_CAMERA_CODE)
     private void dongtaiQuanxian() {
@@ -417,7 +420,21 @@ public class MainActivity extends BaseActivity {
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
-        checkUpData();
+        writepermission();
+    }
+
+    @AfterPermissionGranted(REQUEST_PERMISSION_CAMERA_CODE_W)
+    private void writepermission() {
+        String[] perms = {Manifest.permission.WRITE_EXTERNAL_STORAGE};
+        if (!EasyPermissions.hasPermissions(this, perms)) {
+            // Do not have permissions, request them now
+            EasyPermissions.requestPermissions(this, getString(R.string.permission_phonestate),
+                    REQUEST_PERMISSION_CAMERA_CODE_W, perms);
+        } else {
+            // Already have permission, do the thing
+            // ...
+            checkUpData();
+        }
     }
 
     private void checkUpData() {
@@ -432,19 +449,30 @@ public class MainActivity extends BaseActivity {
                     downLoadBean = gson.fromJson(jsonString, DownLoadBean.class);
                     versionName = downLoadBean.getVersion();
                     downloadUrl = downLoadBean.getDownload();
-                    String localversionname = ApkUtils.getVersionName(MainActivity.this);
 
-                    if (localversionname.equals(versionName)) {
-//                    showToast("");
-                    } else {
-                        Intent intent = new Intent();
-                        intent.setAction("android.intent.action.VIEW");
-                        Uri content_url = Uri.parse(downloadUrl);
-                        intent.setData(content_url);
-                        startActivity(intent);
-                    }
+                    Looper.prepare();
+                    UpdateAppUtils.from(MainActivity.this)
+                            .checkBy(UpdateAppUtils.CHECK_BY_VERSION_NAME) //更新检测方式，默认为VersionCode
+                            .serverVersionName(versionName)
+                            .apkPath(downloadUrl)
+                            .showNotification(true) //是否显示下载进度到通知栏，默认为true
+                            .downloadBy(UpdateAppUtils.DOWNLOAD_BY_APP) //下载方式：app下载、手机浏览器下载。默认app下载
+                            .isForce(true) //是否强制更新，默认false 强制更新情况下用户不同意更新则不能使用app
+                            .update();
+                    Looper.loop();
+//                    String localversionname = ApkUtils.getVersionName(MainActivity.this);
+//
+//                    if (localversionname.equals(versionName)) {
+//                    } else {
+//                        Intent intent = new Intent();
+//                        intent.setAction("android.intent.action.VIEW");
+//                        Uri content_url = Uri.parse(downloadUrl);
+//                        intent.setData(content_url);
+//                        startActivity(intent);
+//                    }
                 }
             }
         }).start();
+
     }
 }