From 828bc5e0e5550b373b61b00db98d0fbba12809e5 Mon Sep 17 00:00:00 2001
From: JIKUN <j314815101@qq.com>
Date: Tue, 8 Aug 2017 11:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  4 ++--
 app/proguard-rules.pro                        |  2 ++
 app/src/main/AndroidManifest.xml              | 20 ++++++++++++++++++-
 .../com/yisingle/app/MainApplication.java     |  6 ++++--
 app/src/main/res/xml/backup_descriptor.xml    |  4 ----
 app/src/main/res/xml/provider_paths.xml       |  7 +++++++
 6 files changed, 34 insertions(+), 9 deletions(-)
 delete mode 100644 app/src/main/res/xml/backup_descriptor.xml
 create mode 100644 app/src/main/res/xml/provider_paths.xml

diff --git a/app/build.gradle b/app/build.gradle
index 29dd374..738c92c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.yisingle.app"
         minSdkVersion 19
         targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         jackOptions {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index aefde93..d3a9a23 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -24,5 +24,7 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
+#腾讯升级框架
 -dontwarn com.tencent.bugly.**
 -keep public class com.tencent.bugly.**{*;}
+-keep class android.support.**{*;}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c57e94d..ffd0eb3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
 
     <!-- 不是sdk需要的权限，是示例中NotiService$NotiInnerService需要的权限 -->
@@ -34,7 +35,6 @@
     <application
         android:name=".MainApplication"
         android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@mipmap/ic_product_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
@@ -67,6 +67,8 @@
 
         </activity>
 
+
+
         <!-- 定位需要的服务 使用2.0的定位需要加上这个 -->
         <service android:name="com.amap.api.location.APSService" />
         <service android:name=".service.OrderService"></service>
@@ -98,6 +100,22 @@
         </receiver>
 
 
+        <!---bugly升级-->
+        <activity
+            android:name="com.tencent.bugly.beta.ui.BetaActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize|locale"
+            android:theme="@android:style/Theme.Translucent" />
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="com.yisingle.app.fileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+        </provider>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/yisingle/app/MainApplication.java b/app/src/main/java/com/yisingle/app/MainApplication.java
index 4954537..174b541 100644
--- a/app/src/main/java/com/yisingle/app/MainApplication.java
+++ b/app/src/main/java/com/yisingle/app/MainApplication.java
@@ -9,7 +9,7 @@
 import com.orhanobut.logger.FormatStrategy;
 import com.orhanobut.logger.Logger;
 import com.orhanobut.logger.PrettyFormatStrategy;
-import com.tencent.bugly.crashreport.CrashReport;
+import com.tencent.bugly.Bugly;
 
 /**
  * Created by jikun on 17/5/12.
@@ -33,7 +33,9 @@ public void onCreate() {
         initLogger();
 
         Utils.init(getApplicationContext());//初始化AndroidUtilCode
-        CrashReport.initCrashReport(getApplicationContext(), "8856cf1479", false);
+
+
+        Bugly.init(getApplicationContext(), "8856cf1479", false);//使用腾讯Bugly 开进行升级  保存bug
 
     }
 
diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml
deleted file mode 100644
index 6fd6103..0000000
--- a/app/src/main/res/xml/backup_descriptor.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<full-backup-content>
-    <!-- Exclude specific shared preferences that contain GCM registration Id -->
-</full-backup-content>
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
new file mode 100644
index 0000000..986d1af
--- /dev/null
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- /storage/emulated/0/Download/${applicationId}/.beta/apk-->
+    <external-path name="beta_external_path" path="Download/"/>
+    <!--/storage/emulated/0/Android/data/${applicationId}/files/apk/-->
+    <external-path name="beta_external_files_path" path="Android/data/"/>
+</paths>