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"> @@ -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" />