From 174d56f04c680a20a846f6faaa8da01e4dd043dc Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Mon, 25 Sep 2023 13:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Esim=E5=8D=A1=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=20=E6=96=B0=E5=A2=9E=E7=9F=AD=E4=BF=A1=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/CMakeLists.txt               |  4 +--
 .../xinyingpower/microphoto/MainActivity.java | 26 +++++++------------
 app/src/main/res/layout/activity_main.xml     |  7 ++---
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index ec3c6dba..58acfe94 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -55,8 +55,8 @@ find_package(ncnn REQUIRED)
 
 SET(YAMC_INC_DIR ${CMAKE_SOURCE_DIR})
 
-#SET(TERM_CORE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../xymp/Core)
-SET(TERM_CORE_ROOT D:/Workspace/xymp/Core)
+SET(TERM_CORE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../xymp/Core)
+#SET(TERM_CORE_ROOT D:/Workspace/xymp/Core)
 
 SET(JSONCPP_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp)
 SET(JSONCPP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/include)
diff --git a/app/src/main/java/com/xinyingpower/microphoto/MainActivity.java b/app/src/main/java/com/xinyingpower/microphoto/MainActivity.java
index e32a80d0..98279642 100644
--- a/app/src/main/java/com/xinyingpower/microphoto/MainActivity.java
+++ b/app/src/main/java/com/xinyingpower/microphoto/MainActivity.java
@@ -62,18 +62,22 @@ public class MainActivity extends AppCompatActivity {
     static {
         System.loadLibrary("microphoto");
     }
+
     private ActivityMainBinding binding;
     private int defaultDataSubId;
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
     }
+
     protected class AppConfig {
         public String cmdid;
         public String server;
         public int port;
         public int protocol;
     }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -102,14 +106,9 @@ public class MainActivity extends AppCompatActivity {
             @Override
             public void onClick(View view) {
 
-                String[] accessPermissions = new String[]{
-                        Manifest.permission.CAMERA,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        Manifest.permission.FOREGROUND_SERVICE,
-                        Manifest.permission.READ_PHONE_STATE,
+                String[] accessPermissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.FOREGROUND_SERVICE, Manifest.permission.READ_PHONE_STATE,
                         /*Manifest.permission.PACKAGE_USAGE_STATS,*/
-                        /*Manifest.permission.SET_TIME,*/
-                };
+                        /*Manifest.permission.SET_TIME,*/};
                 boolean needRequire = false;
                 for (String access : accessPermissions) {
                     int curPermission = ActivityCompat.checkSelfPermission(MainActivity.this, access);
@@ -119,10 +118,7 @@ public class MainActivity extends AppCompatActivity {
                     }
                 }
                 if (needRequire) {
-                    ActivityCompat.requestPermissions(
-                            MainActivity.this,
-                            accessPermissions,
-                            MY_PERMISSIONS_REQUEST_FOREGROUND_SERVICE);
+                    ActivityCompat.requestPermissions(MainActivity.this, accessPermissions, MY_PERMISSIONS_REQUEST_FOREGROUND_SERVICE);
                     return;
                 }
 
@@ -361,7 +357,7 @@ public class MainActivity extends AppCompatActivity {
             BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
             String line;
             StringBuilder stringBuilder = new StringBuilder();
-            while((line = bufferedReader.readLine()) != null) {
+            while ((line = bufferedReader.readLine()) != null) {
                 stringBuilder.append(line);
             }
             bufferedReader.close();
@@ -377,8 +373,7 @@ public class MainActivity extends AppCompatActivity {
             e.printStackTrace();
         } catch (JSONException e) {
             e.printStackTrace();
-        }
-        finally {
+        } finally {
             if (inputStreamReader != null) {
                 try {
                     inputStreamReader.close();
@@ -412,8 +407,7 @@ public class MainActivity extends AppCompatActivity {
             e.printStackTrace();
         } catch (JSONException e) {
             e.printStackTrace();
-        }
-        finally {
+        } finally {
             if (outputStreamWriter != null) {
                 try {
                     outputStreamWriter.close();
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d5b8c90d..f3378c95 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -38,7 +38,7 @@
 
         app:layout_constraintLeft_toRightOf="@+id/cmdid"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/cmdid"  />
+        app:layout_constraintTop_toTopOf="@+id/cmdid" />
 
     <TextView
         android:id="@+id/textView"
@@ -154,6 +154,7 @@
         android:text="TP 4"
         app:layout_constraintStart_toEndOf="@+id/takePhotoBtn3"
         app:layout_constraintTop_toBottomOf="@+id/simchange" />
+
     <Button
         android:id="@+id/gps"
         android:layout_width="wrap_content"
@@ -195,11 +196,11 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="48dp"
-        app:constraint_referenced_ids="startServBtn,stopServBtn,takePhotoBtn,takePhotoBtn2,simchange,simchange2,gps,netgps,tcpudp,tcpudpsend,video,video2"
+        app:constraint_referenced_ids="gps,netgps,tcpudp,tcpudpsend,video,video2"
         app:flow_horizontalGap="20dp"
         app:flow_wrapMode="chain"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/port" />
+        app:layout_constraintTop_toBottomOf="@+id/takePhotoBtn4" />
 
     <TextView