调整UI

app/src/main/java/com/xinyingpower/microphoto/MainActivity.java

@@ -126,6 +126,22 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
+        this.binding.takePhotoBtn3.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                MicroPhotoService.takePhoto(MainActivity.this, 3, 255, true);
+//                setDefaultDataSubId(2);
+            }
+        });
+
+        this.binding.takePhotoBtn4.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                MicroPhotoService.takePhoto(MainActivity.this, 4, 255, true);
+//                setDefaultDataSubId(2);
+            }
+        });
+
         this.binding.stopServBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

app/src/main/java/com/xinyingpower/microphoto/MicroPhotoService.java

@@ -182,7 +182,7 @@ public class MicroPhotoService extends Service {
         // int port = 40032;
         // String ip = "192.168.50.50";
         int port = 6891;
-        String cmdid = "XY-ANDROIDSIM-002";
+        String cmdid = "XY-ANDROIDSIM-003";
         mHandler = init(appPath, ip, port, cmdid);
 
         // registerHeartbeatTimer(getHeartbeatDuration());

app/src/main/res/layout/activity_main.xml

@@ -21,14 +21,13 @@
         android:id="@+id/server"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="114dp"
+        android:layout_marginLeft="40dp"
         android:ems="10"
         android:inputType=""
         app:layout_constraintBottom_toBottomOf="@+id/textView"
         app:layout_constraintStart_toEndOf="@+id/textView"
         app:layout_constraintTop_toTopOf="@+id/textView" />
 
-
     <TextView
         android:id="@+id/textView2"
         android:layout_width="wrap_content"
@@ -46,59 +45,93 @@
         android:layout_height="wrap_content"
         android:ems="10"
         android:inputType=""
-        android:text="Name"
+        android:text=""
         app:layout_constraintBottom_toBottomOf="@+id/textView2"
         app:layout_constraintLeft_toLeftOf="@+id/server"
         app:layout_constraintLeft_toRightOf="@+id/textView2"
         app:layout_constraintTop_toTopOf="@+id/textView2" />
 
+    <Button
+        android:id="@+id/startServBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        app:layout_constraintTop_toBottomOf="@+id/port"
+        android:text="Start" />
+
     <Button
         android:id="@+id/stopServBtn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginStart="12dp"
         android:enabled="false"
+        app:layout_constraintTop_toBottomOf="@+id/port"
+        app:layout_constraintStart_toEndOf="@+id/startServBtn"
         android:text="Stop" />
 
     <Button
-        android:id="@+id/startServBtn"
+        android:id="@+id/simchange"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Start" />
+        android:layout_marginTop="12dp"
+        app:layout_constraintTop_toBottomOf="@+id/startServBtn"
+        app:layout_constraintStart_toStartOf="@+id/startServBtn"
+        android:text="sim卡获取" />
 
     <Button
-        android:id="@+id/takePhotoBtn2"
+        android:id="@+id/simchange2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Take Photo2" />
+        android:layout_marginTop="12dp"
+        android:layout_marginStart="12dp"
+        app:layout_constraintTop_toBottomOf="@+id/startServBtn"
+        app:layout_constraintStart_toEndOf="@+id/simchange"
+        android:text="切换sim2" />
 
     <Button
         android:id="@+id/takePhotoBtn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Take Photo" />
+        android:layout_marginTop="12dp"
+        app:layout_constraintTop_toBottomOf="@+id/simchange"
+        android:text="Take Photo"
+        />
 
     <Button
-        android:id="@+id/simchange"
+        android:id="@+id/takePhotoBtn2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="sim卡获取" />
+        android:layout_marginTop="12dp"
+        android:layout_marginStart="12dp"
+        app:layout_constraintTop_toBottomOf="@+id/simchange"
+        app:layout_constraintStart_toEndOf="@+id/takePhotoBtn"
+        android:text="TP 2"
+        />
 
     <Button
-        android:id="@+id/simchange2"
+        android:id="@+id/takePhotoBtn3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="切换sim2" />
+        android:layout_marginTop="12dp"
+        android:layout_marginStart="12dp"
+        android:text="TP 3"
+        app:layout_constraintTop_toBottomOf="@+id/simchange"
+        app:layout_constraintStart_toEndOf="@+id/takePhotoBtn2"
+         />
 
-    <androidx.constraintlayout.helper.widget.Flow
+    <Button
-        android:layout_width="match_parent"
+        android:id="@+id/takePhotoBtn4"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="12dp"
-        android:layout_marginTop="48dp"
+        android:layout_marginTop="12dp"
-        app:constraint_referenced_ids="startServBtn,stopServBtn,takePhotoBtn,takePhotoBtn2,simchange,simchange2"
+        android:text="TP 4"
-        app:flow_horizontalGap="20dp"
+        app:layout_constraintTop_toBottomOf="@+id/simchange"
-        app:flow_wrapMode="chain"
+        app:layout_constraintStart_toEndOf="@+id/takePhotoBtn3"
-        app:layout_constraintStart_toStartOf="parent"
+         />
-        app:layout_constraintTop_toBottomOf="@+id/port" />
+
+
 
     <TextView
 
@@ -106,11 +139,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
-        app:layout_constraintVertical_bias="0.929" />
 
     <SurfaceView
         android:id="@+id/surfaceView"