From c803fd6353ddc60cb74a48aef1f266d3746eb607 Mon Sep 17 00:00:00 2001
From: Administrator <981964879@qq.com>
Date: Wed, 5 Aug 2020 09:47:34 +0800
Subject: [PATCH] =?UTF-8?q?version:2.0.1.9=20update:2020.08.5=20fix:?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=81=E5=B1=8F=E5=90=8E=20=E7=9B=B8?=
 =?UTF-8?q?=E6=9C=BA=E7=AE=A1=E6=8E=A7=E5=A4=B1=E6=95=88=20add:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                               |  4 ++--
 app/src/main/AndroidManifest.xml               |  3 ++-
 .../myappstore/activity/MainActivity.java      | 17 ++++++++---------
 .../myappstore/network/HTTPInterface.java      | 12 ++++++------
 .../myappstore/server/InitJpushServer.java     | 12 ++++++------
 .../com/mjsheng/myappstore/utils/ApkUtils.java | 18 +++++++++++-------
 6 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index da208b3..78c11c5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,8 +38,8 @@ android {
     productFlavors {
         official {
             flavorDimensions "default"
-            versionCode 1009
-            versionName "2.0.1.9"// 正式jiaoguanyi.com 双数正式 单数测试
+            versionCode 1020
+            versionName "2.0.2.0"// 正式jiaoguanyi.com 双数正式 单数测试
             /*********************************极光推送************************************/
             manifestPlaceholders = [
                     JPUSH_PKGNAME: "com.jiaoguanyi.appstore",
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e2f5877..df648cb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,7 +43,8 @@
     <uses-permission
         android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"
         android:maxSdkVersion="22" />
-
+    <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
+        android:maxSdkVersion="23"/>
     <application
         android:name=".MyApplication"
         android:allowBackup="true"
diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java
index 298fa65..72bd118 100644
--- a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java
+++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java
@@ -30,7 +30,6 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.arialyy.aria.core.Aria;
@@ -59,7 +58,6 @@ import com.mjsheng.myappstore.bean.NetAndLaunchBean;
 import com.mjsheng.myappstore.bean.NetAndLaunchData;
 import com.mjsheng.myappstore.bean.StudentsInfo;
 import com.mjsheng.myappstore.bean.UploadAppInfo;
-import com.mjsheng.myappstore.bean.UserInfo;
 import com.mjsheng.myappstore.comm.CommonDatas;
 import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper;
 import com.mjsheng.myappstore.network.HTTPInterface;
@@ -73,7 +71,6 @@ import com.mjsheng.myappstore.network.api.NetAndLaunchApi;
 import com.mjsheng.myappstore.network.api.SystemSettingApi;
 import com.mjsheng.myappstore.network.api.UploadAppInfoApi;
 import com.mjsheng.myappstore.server.MyDownloadService;
-import com.mjsheng.myappstore.utils.ApkUtils;
 import com.mjsheng.myappstore.utils.Configure;
 import com.mjsheng.myappstore.utils.ExampleUtil;
 import com.mjsheng.myappstore.utils.MySQLData;
@@ -923,6 +920,7 @@ public class MainActivity extends AppCompatActivity {
     private void initJpush() {
         JPushInterface.init(this);
         setAlias();
+
         String rid = JPushInterface.getRegistrationID(MainActivity.this);
         if (!rid.isEmpty()) {
 //            ToastUtil.debugShow("RegId:" + rid);
@@ -1050,6 +1048,7 @@ public class MainActivity extends AppCompatActivity {
         String appstore = "com.jiaoguanyi.appstore";
         String store = "com.jiaoguanyi.store";
         String iflytek = "iflytek.eface2sdk";
+//        String iflytek = "com.estrongs.android.pop";
         if (!TextUtils.isEmpty(result)) {
             LogUtils.e(result);
             if (!result.contains(appstore)) {
@@ -1483,12 +1482,12 @@ public class MainActivity extends AppCompatActivity {
         }
 
 
-        Intent intent2 = new Intent("qch_camera_forbid");
-        intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
-        sendBroadcast(intent2);
-        Intent intent1 = new Intent("qch_camera_open");
-        intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
-        sendBroadcast(intent1);
+//        Intent intent2 = new Intent("qch_camera_forbid");
+//        intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
+//        sendBroadcast(intent2);
+//        Intent intent1 = new Intent("qch_camera_open");
+//        intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
+//        sendBroadcast(intent1);
     }
 
 
diff --git a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java
index b89d087..4f9c3fa 100644
--- a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java
+++ b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java
@@ -733,12 +733,12 @@ public class HTTPInterface {
         }
 
 
-        Intent intent2 = new Intent("qch_camera_forbid");
-        intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
-        context.sendBroadcast(intent2);
-        Intent intent1 = new Intent("qch_camera_open");
-        intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
-        context.sendBroadcast(intent1);
+//        Intent intent2 = new Intent("qch_camera_forbid");
+//        intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
+//        context.sendBroadcast(intent2);
+//        Intent intent1 = new Intent("qch_camera_open");
+//        intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
+//        context.sendBroadcast(intent1);
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java b/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java
index 90ccefa..c05355d 100644
--- a/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java
+++ b/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java
@@ -633,12 +633,12 @@ public class InitJpushServer extends Service {
         }
 
 
-        Intent intent2 = new Intent("qch_camera_forbid");
-        intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
-        sendBroadcast(intent2);
-        Intent intent1 = new Intent("qch_camera_open");
-        intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
-        sendBroadcast(intent1);
+//        Intent intent2 = new Intent("qch_camera_forbid");
+//        intent2.putExtra("camera_package_name", camera_not).setPackage("com.android.settings");
+//        sendBroadcast(intent2);
+//        Intent intent1 = new Intent("qch_camera_open");
+//        intent1.putExtra("camera_package_name", camera_ok).setPackage("com.android.settings");
+//        sendBroadcast(intent1);
     }
 
 
diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java
index a30fcd5..16eab7e 100644
--- a/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java
+++ b/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java
@@ -603,13 +603,17 @@ public class ApkUtils {
     }};
     public static List<String> systemapp = new ArrayList<String>() {{
         //需要管控的系统应用
-        this.add("com.android.gallery3d");
-        this.add("com.android.deskclock");
-        this.add("com.android.music");
-        this.add("com.mediatek.camera");
-        this.add("com.android.documentsui");
-        this.add("com.android.soundrecorder");
-        this.add("com.android.browser");
+        this.add("com.android.gallery3d");//图库
+        this.add("com.android.deskclock");//时钟
+        this.add("com.android.music");//音乐
+        this.add("com.mediatek.camera");//相机
+        this.add("com.android.documentsui");//文件
+        this.add("com.android.soundrecorder");//录音机
+        this.add("com.android.browser");//浏览器
+        this.add("com.android.mms");//信息
+        this.add("com.android.fmradio");//FM电台
+        this.add("com.android.dialer");//电话
+        this.add("com.android.contacts");//通讯录
     }};