From aa96ad2c66c5930f639f59ab5a067de59a8c1372 Mon Sep 17 00:00:00 2001
From: itgaojian163 <itgaojian@163.com>
Date: Sun, 18 Dec 2022 19:12:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                   | 14 +++++++++++++-
 .../java/com/tenlion/xztouch/MainActivity.java     |  4 ++--
 .../com/tenlion/xztouch/push/ServerClient.java     |  2 +-
 app/src/main/res/values/themes.xml                 |  1 +
 app/src/main/res/xml/network_config.xml            | 11 +++++++++++
 5 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/xml/network_config.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe446ba..0bfe044 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_HISTORY_BOOKMARKS" />
+
+
     <application
         android:name=".BaseMyApplication"
         android:allowBackup="true"
@@ -11,8 +22,9 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_config"
         android:theme="@style/Theme.Xztouch"
-        tools:targetApi="31">
+       >
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/app/src/main/java/com/tenlion/xztouch/MainActivity.java b/app/src/main/java/com/tenlion/xztouch/MainActivity.java
index a1795b9..a60c160 100644
--- a/app/src/main/java/com/tenlion/xztouch/MainActivity.java
+++ b/app/src/main/java/com/tenlion/xztouch/MainActivity.java
@@ -151,7 +151,7 @@ public class MainActivity extends Activity {
         requestWindowFeature(1);
         getWindow().setFlags(1024, 1024);
         getWindow().addFlags(128);
-        setContentView((int) R.layout.activity_main);
+        setContentView(R.layout.activity_main);
         this.mContext = this;
         initContentView();
         this.mBoradCast = new MessageBoradCast();
@@ -196,7 +196,7 @@ public class MainActivity extends Activity {
 
     private void refreshData() {
         if (TextUtils.isEmpty(this.mBaseUrl) || TextUtils.isEmpty(this.mDeviceCode)) {
-            ToastUtils.show((CharSequence) "请设置网络地址与设备号");
+            ToastUtils.show("请设置网络地址与设备号");
             showSettingPwdDialog();
             return;
         }
diff --git a/app/src/main/java/com/tenlion/xztouch/push/ServerClient.java b/app/src/main/java/com/tenlion/xztouch/push/ServerClient.java
index 58be311..52cd4aa 100755
--- a/app/src/main/java/com/tenlion/xztouch/push/ServerClient.java
+++ b/app/src/main/java/com/tenlion/xztouch/push/ServerClient.java
@@ -95,7 +95,7 @@ public class ServerClient extends Service {
         Notification notification = null;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             NotificationChannel channel = new NotificationChannel(PRIMARY_CHANNEL,
-                    "亲情电话", NotificationManager.IMPORTANCE_DEFAULT);
+                    "展览系统", NotificationManager.IMPORTANCE_DEFAULT);
             channel.setLightColor(Color.GREEN);
             channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
             getNotificationManager(context).createNotificationChannel(channel);
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a9aa10c..d6f95fe 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -11,6 +11,7 @@
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:windowNoTitle">true</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/network_config.xml b/app/src/main/res/xml/network_config.xml
new file mode 100644
index 0000000..4072b0d
--- /dev/null
+++ b/app/src/main/res/xml/network_config.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="MissingDefaultResource">
+    <base-config cleartextTrafficPermitted="true"/>
+    <debug-overrides>
+        <trust-anchors>
+            <certificates src="user"/>
+        </trust-anchors>
+    </debug-overrides>
+</network-security-config>
\ No newline at end of file