Merge remote-tracking branch 'origin/master' into baotou_medical_school

# Conflicts:
#	app/build.gradle

app/src/main/AndroidManifest.xml

@@ -42,84 +42,64 @@
             android:exported="false" />
         <activity
             android:name=".home.leave.LeaveActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".main.monitor.MonitorActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".main.rule.RuleDetailActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".main.rule.RuleActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".home.notice.NoticeMsgSystemActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".main.msds.HtmlFullScreenActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".main.msds.InstructionActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".main.things.ThingsActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".main.risk.RiskListActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".home.sign.SignInActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".main.person.LaboratoryPersonActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".home.lab_info.LabDetailActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".main.MainActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".home.auth.ChoiceAuthActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".home.notice.NoticeListActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".home.lab_info.LabDescActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".HomeActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false"
             android:hardwareAccelerated="true" />
         <activity
             android:name=".app.InitActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".home.setting.SettingActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".StartActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:exported="true"
             android:launchMode="singleTop">
             <intent-filter>

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

@@ -16,6 +16,9 @@ import core.ui.common.AbsUIDelegate;
 import core.ui.common.UIDelegateImpl;
 import core.util.ScreenAdapter;
 import io.reactivex.rxjava3.disposables.Disposable;
+import xn.xxp.room.RoomTool;
+import xn.xxp.room.bean.DeviceConfig;
+import xn.xxp.room.dao.DeviceConfigDao;
 
 public abstract class BaseActivity<VB extends ViewBinding> extends AppCompatActivity {
 
@@ -25,7 +28,6 @@ public abstract class BaseActivity<VB extends ViewBinding> extends AppCompatActi
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         ScreenAdapter.INSTANCE.setCustomDensity(this);
         uiDelegate = AbsUIDelegate.Companion.create();
         configImmersiveMode();

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

@@ -7,6 +7,8 @@ import com.blankj.utilcode.util.ActivityUtils;
 import core.ui.activity.BaseActivity;
 import xn.xxp.databinding.ActivityStartBinding;
 import xn.xxp.app.InitActivity;
+import xn.xxp.room.RoomTool;
+import xn.xxp.room.bean.DeviceConfig;
 import xn.xxp.utils.Tool;
 
 public class StartActivity extends BaseActivity<ActivityStartBinding> {

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

@@ -6,6 +6,7 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.widget.CompoundButton;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -23,6 +24,7 @@ import com.hikvision.dmb.display.InfoDisplayApi;
 import com.hikvision.dmb.network.InfoNetworkApi;
 import com.hikvision.dmb.system.InfoSystemApi;
 import com.kongzue.dialogx.dialogs.MessageDialog;
+import com.njlz.card.DeviceUtils;
 
 import xn.xxp.R;
 import xn.xxp.databinding.ActivitySettingBinding;
@@ -117,6 +119,13 @@ public class SettingActivity extends AppCompatActivity {
                     ActivityUtils.startActivity(FaceListActivity.class);
                 }
             });
+            // 锁
+            binding.lock.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                DeviceUtils.setElectricLock(1, isChecked);
+                if (isChecked) {
+                    ToastUtils.showLong("开锁后需要手动关锁");
+                }
+            });
 
             binding.testBaseUrlBT.setOnClickListener(v -> binding.httpUriET.setText("http://192.168.1.8/api/"));
             binding.xnBaseUrlBT.setOnClickListener(v -> binding.httpUriET.setText("http://10.148.100.82/api/"));

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

@@ -1,5 +1,6 @@
 package xn.xxp.room;
 
+import androidx.room.AutoMigration;
 import androidx.room.Database;
 import androidx.room.Room;
 import androidx.room.RoomDatabase;
@@ -15,7 +16,7 @@ import xn.xxp.room.dao.FaceDao;
 import xn.xxp.room.dao.LabConfigDao;
 import xn.xxp.room.dao.NoticeSummaryDao;
 
-@Database(entities = {Face.class, DeviceConfig.class, LabConfig.class, NoticeSummary.class}, version = 1)
+@Database(version = 1, entities = {Face.class, DeviceConfig.class, LabConfig.class, NoticeSummary.class})
 public abstract class RoomTool extends RoomDatabase {
     private static RoomTool INSTANCE;
 

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

@@ -17,7 +17,6 @@ public class DeviceConfig {
     private String adminPas = "admin@098&";
     private String terminalAuth = "";
 
-
     public int getId() {
         return id;
     }

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

@@ -205,6 +205,22 @@
                     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"
+                        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.AppCompatButton
                         android:id="@+id/setting_BT"
                         android:layout_width="wrap_content"