1.删除配置强制横屏代码

app/build.gradle

@@ -19,7 +19,7 @@ android {
         minSdk 31
         targetSdk 35
         versionCode 2
-        versionName "2.14"
+        versionName "2.15"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         room {

app/src/main/java/core/ui/activity/BaseActivity.java

@@ -28,13 +28,6 @@ public abstract class BaseActivity<VB extends ViewBinding> extends AppCompatActi
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        DeviceConfig deviceConfig = RoomTool.getInstance().deviceConfigDao().getDeviceConfig();
-        if (null == deviceConfig || deviceConfig.isOrientation()) {
-            LogUtils.d("强制横屏", true);
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        } else {
-            LogUtils.d("强制横屏", false);
-        }
         ScreenAdapter.INSTANCE.setCustomDensity(this);
         uiDelegate = AbsUIDelegate.Companion.create();
         configImmersiveMode();

app/src/main/java/xn/xxp/StartActivity.java

@@ -16,12 +16,6 @@ public class StartActivity extends BaseActivity<ActivityStartBinding> {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        DeviceConfig deviceConfig = RoomTool.getInstance().deviceConfigDao().getDeviceConfig();
-        if (null == deviceConfig) {
-            deviceConfig = new DeviceConfig();
-            deviceConfig.setOrientation(true);
-        }
-        RoomTool.getInstance().deviceConfigDao().insert(deviceConfig);
         ActivityUtils.startActivity(InitActivity.class);
         finish();
     }

app/src/main/java/xn/xxp/app/InitActivity.java

@@ -71,6 +71,9 @@ public class InitActivity extends BaseActivity<ActivityInitBinding> {
     protected void initViews(Bundle savedInstanceState) {
         super.initViews(savedInstanceState);
         deviceConfig = RoomTool.getInstance().deviceConfigDao().getDeviceConfig();
+        if (null == deviceConfig) {
+            deviceConfig = new DeviceConfig();
+        }
         EthernetConfig ethernetConfig = InfoNetworkApi.getEthernetConfig();
         String ip = ethernetConfig.getIpAddress();
         deviceConfig.setIp(ip);

app/src/main/java/xn/xxp/home/setting/SettingActivity.java

@@ -119,9 +119,6 @@ public class SettingActivity extends AppCompatActivity {
                     ActivityUtils.startActivity(FaceListActivity.class);
                 }
             });
-            // 是否强制横屏
-            binding.orientation.setChecked(deviceConfig.isOrientation());
-            binding.orientation.setOnCheckedChangeListener((buttonView, isChecked) -> ToastUtils.showLong("修改此参数保存后再重启设备后生效!"));
             // 锁
             binding.lock.setOnCheckedChangeListener((buttonView, isChecked) -> {
                 DeviceUtils.setElectricLock(1, isChecked);
@@ -179,7 +176,6 @@ public class SettingActivity extends AppCompatActivity {
             return;
         }
         deviceConfig.setAdminPas(oldPasswordETText.toString());
-        deviceConfig.setOrientation(binding.orientation.isChecked());
         deviceConfigDao.insert(deviceConfig);
         ToastUtils.showShort("即将重启App");
         ThreadUtils.runOnUiThreadDelayed(() -> Tool.INSTANCE.reStartApp("主动重启"), 1500);

app/src/main/java/xn/xxp/room/RoomTool.java

@@ -24,7 +24,7 @@ public abstract class RoomTool extends RoomDatabase {
         if (INSTANCE == null) {
             synchronized (RoomTool.class) {
                 if (INSTANCE == null) {
-                    INSTANCE = Room.databaseBuilder(Utils.getApp(), RoomTool.class, "room_db").allowMainThreadQueries().fallbackToDestructiveMigration().build();
+                    INSTANCE = Room.databaseBuilder(Utils.getApp(), RoomTool.class, "room_db").allowMainThreadQueries().build();
                 }
             }
         }

app/src/main/java/xn/xxp/room/bean/DeviceConfig.java

@@ -16,16 +16,6 @@ public class DeviceConfig {
     private String mqttAddress = "tcp://172.16.0.65:31072";
     private String adminPas = "admin@098&";
     private String terminalAuth = "";
-    private boolean isOrientation = true;
-
-
-    public boolean isOrientation() {
-        return isOrientation;
-    }
-
-    public void setOrientation(boolean orientation) {
-        isOrientation = orientation;
-    }
 
     public int getId() {
         return id;

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

@@ -206,22 +206,6 @@
                     android:layout_margin="5dp">
 
                     <androidx.appcompat.widget.SwitchCompat
-                        android:id="@+id/orientation"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center"
-                        android:paddingHorizontal="10dp"
-                        android:text="强制横屏"
-                        app:switchPadding="10dp" />
-
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:layout_width="wrap_content"
-                    android:layout_height="50dp"
-                    android:layout_margin="5dp">
-
-                    <androidx.appcompat.widget.SwitchCompat
                         android:id="@+id/lock"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"