设置，修改bug

app/build.gradle

@@ -16,6 +16,10 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
     signingConfigs {
         release {
             storeFile file('src/key/key.keystore')
@@ -71,4 +75,6 @@ dependencies {
     implementation 'com.github.getActivity:XXPermissions:20.0'
     implementation 'androidx.databinding:databinding-runtime:4.0.0'
     implementation 'com.github.zrunker:ZImageView:v1.0'
+    implementation "androidx.lifecycle:lifecycle-viewmodel:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
 }

app/src/main/AndroidManifest.xml

@@ -24,13 +24,12 @@
         android:theme="@style/Theme.MainTheme"
         tools:targetApi="31">
         <activity
+            android:name=".SettingActivity"
+            android:exported="false" />
+        <activity
             android:name=".HistoryActivity"
-            android:exported="true" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            android:exported="true">
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
 
         <meta-data
@@ -62,7 +61,11 @@
         <activity
             android:name=".MainActivity"
             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".ShowImageActivity"

app/src/main/java/com/cfmlg/mlg/HistoryActivity.java

@@ -42,6 +42,7 @@ public class HistoryActivity extends AppCompatActivity {
             }
         });
 
+        getStatus();
 
         binding.imgTime.setOnClickListener(new View.OnClickListener() {
             @Override

app/src/main/java/com/cfmlg/mlg/MainViewModel.java

@@ -0,0 +1,20 @@
+package com.cfmlg.mlg;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+
+public class MainViewModel extends ViewModel {
+
+    private MutableLiveData<Integer> selectedRadioId = new MutableLiveData<>();
+//    private MutableLiveData<Integer> selectedRadioid = new MutableLiveData<>();
+
+    public LiveData<Integer> getSelectedRadioId() {
+        return selectedRadioId;
+    }
+
+    public void setSelectedRadioId(int id) {
+        selectedRadioId.setValue(id);
+    }
+
+}

app/src/main/java/com/cfmlg/mlg/SettingActivity.java

@@ -0,0 +1,46 @@
+package com.cfmlg.mlg;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.databinding.DataBindingUtil;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+
+import com.cfmlg.mlg.databinding.ActivitySettingBinding;
+
+public class SettingActivity extends AppCompatActivity {
+
+    public static int ladyTime = 2;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ActivitySettingBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_setting);
+
+        binding.radioGroup1.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                if(R.id.radioButton2 == checkedId) {
+                    binding.layoutTime.setVisibility(View.VISIBLE);
+                } else {
+                    binding.layoutTime.setVisibility(View.GONE);
+                    ladyTime = 0;
+                }
+            }
+        });
+
+        binding.radioGroup2.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                if(R.id.radioButton3 == checkedId) {
+                    ladyTime = 4;
+                } else if(R.id.radioButton4 == checkedId) {
+                    ladyTime = 7;
+                } else {
+                    ladyTime = 12;
+                }
+            }
+        });
+    }
+}

app/src/main/java/com/cfmlg/mlg/Video.java

@@ -78,7 +78,7 @@ public class Video extends AppCompatActivity {
     private Surface mSurface = null;
     //return 1:  jpg  0:h264
     private TextView countdownTextView;
-    private int totalTime = 4;
+    private int totalTime = SettingActivity.ladyTime;
     private RelativeLayout mainPage;
     private TextView tvHistory, tvQuestion;
     private TextView tvConnect;
@@ -147,6 +147,20 @@ public class Video extends AppCompatActivity {
         service.scheduleAtFixedRate(new Task1(), initialDelay1, period1, TimeUnit.SECONDS);
 
         binding.imv.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.ya));
+        binding.backup.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mainPage.setVisibility(View.VISIBLE);
+            }
+        });
+
+        binding.settings.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent2 = new Intent(Video.this, SettingActivity.class);
+                startActivity(intent2);
+            }
+        });
 
         new Thread(new Runnable() {
             @Override
@@ -178,7 +192,7 @@ public class Video extends AppCompatActivity {
                                 if (totalTime > 0) {
                                     handler.postDelayed(this, 1000);
                                 } else {
-                                    totalTime = 4;
+                                    totalTime = SettingActivity.ladyTime;
                                     countdownTextView.setVisibility(View.GONE);
                                     SoundPool soundPool = new SoundPool.Builder().setMaxStreams(1).build();
                                     int soundId = soundPool.load(Video.this, R.raw.kuaimen, 1); // 加载音频资源
@@ -224,13 +238,9 @@ public class Video extends AppCompatActivity {
                         }, 50);
                     }
                 }.start();
-
-
-
             }
         });
 
-
         binding.handlerecord.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -286,6 +296,14 @@ public class Video extends AppCompatActivity {
                     @Override
                     public void run() {
                         circleView.setVisibility(View.GONE);
+                        String packageName = getApplicationContext().getPackageName();
+
+                        Intent intent = getApplicationContext().getPackageManager()
+                                .getLaunchIntentForPackage(packageName);
+                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+
+                        startActivity(intent);
+                        finish();
                     }
                 }, 5000);
 
@@ -319,6 +337,13 @@ public class Video extends AppCompatActivity {
         });
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();  // Always call the superclass method first
+
+        totalTime = SettingActivity.ladyTime;
+    }
+
     public boolean onTouchEvent(MotionEvent e) {
         float x = e.getX();
         float y = e.getY();
@@ -334,6 +359,11 @@ public class Video extends AppCompatActivity {
         return true;
     }
 
+    public void toHistory(View view) {
+        Intent intent2 = new Intent(Video.this, HistoryActivity.class);
+        startActivity(intent2);
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -377,7 +407,7 @@ public class Video extends AppCompatActivity {
                         if (totalTime > 0) {
                             handler.postDelayed(this, 1000);
                         } else {
-                            totalTime = 4;
+                            totalTime = SettingActivity.ladyTime;
                             countdownTextView.setVisibility(View.GONE);
                             SoundPool soundPool = new SoundPool.Builder().setMaxStreams(1).build();
                             int soundId = soundPool.load(Video.this, R.raw.kuaimen, 1); // 加载音频资源

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

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data></data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:context=".SettingActivity">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            tools:context=".SettingActivity">
+
+            <TextView
+                android:id="@+id/tvState"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="50dp"
+                android:layout_marginTop="50dp"
+                android:padding="10dp"
+                android:text="延迟拍摄"
+                android:textColor="@color/black" />
+
+            <RadioGroup
+                android:id="@+id/radioGroup1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="48dp"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/radioButton1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:checked="true"
+                    android:text="关闭" />
+
+                <RadioButton
+                    android:id="@+id/radioButton2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:checked="false"
+                    android:text="打开" />
+
+            </RadioGroup>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/layoutTime"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            android:orientation="horizontal"
+            tools:context=".SettingActivity">
+
+            <TextView
+                android:id="@+id/tvTime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="50dp"
+                android:layout_marginTop="50dp"
+                android:padding="10dp"
+                android:text="延迟时间"
+                android:textColor="@color/black" />
+
+            <RadioGroup
+                android:id="@+id/radioGroup2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="48dp"
+                android:orientation="vertical">
+
+                <RadioButton
+                    android:id="@+id/radioButton3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:checked="true"
+                    android:text="2秒" />
+
+                <RadioButton
+                    android:id="@+id/radioButton4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:checked="false"
+                    android:text="5秒" />
+
+                <RadioButton
+                    android:id="@+id/radioButton5"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:checked="false"
+                    android:text="10秒" />
+
+            </RadioGroup>
+        </LinearLayout>
+    </LinearLayout>
+</layout>

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

@@ -8,13 +8,38 @@
     tools:context=".Video"
     tools:ignore="ExtraText">
 
+
+
     <TextureView
         android:id="@+id/mSurfaceview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:layout_editor_absoluteX="16dp"
         tools:layout_editor_absoluteY="0dp" />
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        >
 
+        <ImageButton
+            android:id="@+id/backup"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentBottom="true"
+            android:background="#00000000"
+            android:rotation="270"
+            android:src="@drawable/back" />
+
+        <ImageButton
+            android:id="@+id/settings"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentTop="true"
+            android:background="#00000000"
+            android:src="@drawable/setting" />
+    </RelativeLayout>
     <ImageButton
         android:id="@+id/imageConnect"
         android:layout_width="wrap_content"
@@ -25,19 +50,21 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/fan" />
+
     <com.cfmlg.mlg.CustomImageView
         android:id="@+id/imv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        android:src="@drawable/ya"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.5"
-        android:src="@drawable/ya"
-        android:visibility="gone"
         tools:ignore="MissingConstraints" />
+
     <LinearLayout
         android:id="@+id/blakgrond"
         android:layout_width="wrap_content"
@@ -103,6 +130,7 @@
             android:layout_alignParentLeft="true"
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="30dp"
+            android:onClick="toHistory"
             android:padding="10dp"
             android:rotation="270"
             android:text="历史记录"
@@ -135,8 +163,7 @@
             android:id="@+id/imgConnect"
             android:layout_width="200dp"
             android:layout_height="200dp"
-            android:layout_centerInParent="true"
-            >
+            android:layout_centerInParent="true">
 
         </ImageView>
 
@@ -158,8 +185,7 @@
                 android:layout_marginTop="10dp"
                 android:rotation="270"
                 android:text="未链接"
-                android:textColor="@color/material_dynamic_primary30"
-                 />
+                android:textColor="@color/material_dynamic_primary30" />
 
             <ImageView
                 android:id="@+id/t2"
@@ -347,14 +373,14 @@
 
         <com.cfmlg.mlg.CirclePercentView
             android:id="@+id/circleView"
-            app:stripeWidth="15dp"
-            app:centerTextSize="16sp"
-            app:percent="0"
-            android:rotation="270"
-            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"/>
+            android:layout_centerInParent="true"
+            android:rotation="270"
+            android:visibility="gone"
+            app:centerTextSize="16sp"
+            app:percent="0"
+            app:stripeWidth="15dp" />
 
     </RelativeLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>