From 2bb058c4d7598bfd733018a929cd0a253c25bdb2 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Sat, 20 Apr 2024 11:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E6=98=BE=E7=A4=BA=E5=BD=93?=
 =?UTF-8?q?=E5=89=8Dcmdid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xypower/mpmaster/MainActivity.java    |  5 +++++
 mpmaster/src/main/res/layout/activity_main.xml     | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java b/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java
index 9a191ef9..9cbe0e81 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java
@@ -13,9 +13,11 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.StrictMode;
+import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Switch;
+import android.widget.TextView;
 
 
 import com.dev.devapi.api.SysApi;
@@ -55,6 +57,9 @@ public class MainActivity extends AppCompatActivity {
         StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
         StrictMode.setThreadPolicy(policy);
 
+        MicroPhotoContext.AppConfig appConfig = MicroPhotoContext.getMpAppConfig(getApplicationContext());
+        ((TextView)findViewById((R.id.cmdid))).setText(TextUtils.isEmpty(appConfig.cmdid) ? "" : appConfig.cmdid);
+
         findViewById(R.id.btnEnableCam3V3).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
diff --git a/mpmaster/src/main/res/layout/activity_main.xml b/mpmaster/src/main/res/layout/activity_main.xml
index 40e22db9..148ed406 100644
--- a/mpmaster/src/main/res/layout/activity_main.xml
+++ b/mpmaster/src/main/res/layout/activity_main.xml
@@ -7,12 +7,12 @@
     tools:context=".MainActivity">
 
     <TextView
+        android:id="@+id/cmdid"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="12dp"
+        android:text=""
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,17 +24,16 @@
         android:layout_marginTop="12dp"
         android:text="Cam3V3 On"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/cmdid" />
 
     <Button
         android:id="@+id/btnDisableCam3V3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
-        android:layout_marginTop="12dp"
         android:text="Cam3V3 Off"
         app:layout_constraintStart_toEndOf="@+id/btnEnableCam3V3"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@+id/btnEnableCam3V3" />
 
     <Button
         android:id="@+id/btnTurnOtgOn"
@@ -93,4 +92,5 @@
         app:layout_constraintTop_toTopOf="@+id/btnTurn485On" />
 
 
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file