change deviceType init location

app/src/main/java/com/ouxuan/oxface/MainActivity.java

@@ -125,11 +125,6 @@ public class MainActivity extends AppCompatActivity {
 
         // 初始化人脸识别配置文件，确保filePath正确设置
         initAndCheckFaceConfig(this);
-
-        // 动态获取设备类型并切换相机配置
-        int deviceType = DeviceSelectDataManager.getInstance(this).getDeviceType();
-        Log.d(TAG, "初始化时获取设备类型: " + deviceType);
-        switchCameraByDeviceType(deviceType);
     }
     
     /**
@@ -890,6 +885,11 @@ public class MainActivity extends AppCompatActivity {
                         ", Hardware ID: " + hardwareId + 
                         ", API Code: " + apiResponse.getCode());
                 
+                // 动态获取设备类型并切换相机配置
+                int deviceType = deviceSelectDataManager.getDeviceType();
+                Log.d(TAG, "选择设备后获取设备类型: " + deviceType);
+                switchCameraByDeviceType(deviceType);
+                
                 // 新增：调用获取小程序码接口和上传人脸小程序码接口
                 // 使用计数器确保两个请求都完成后再进入人脸识别界面
                 final int[] completedRequests = {0};

app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java

@@ -1190,6 +1190,8 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
         // 根据后台配置更新按钮显示状态
         updateButtonVisibility();
 
+        resumeCamera();
+        
         LogManager.logInfo(TAG, "OXFaceOnlineActivity onResume");
     }
 
@@ -1211,6 +1213,7 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
                         @Override
                         public void onGetCameraData(byte[] data, Camera camera, int width, int height) {
                             try {
+                                Log.d(TAG, "45466: 444:"+isNeedCamera);
                                 // 摄像头预览数据进行人脸检测
                                 if (isNeedCamera) {
                                     // 增加帧计数器和时间间隔控制
@@ -1227,6 +1230,7 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
                                         Log.d(TAG, "onGetCameraData: 666:"+FaceSDKManager.initStatus);
                                         // 检查应用是否处于前台
                                         if (!isApplicationInForeground()) {
+                                            Log.d(TAG, "isApplicationInForeground: 777:"+isApplicationInForeground());
                                             // 如果应用在后台，减少处理频率，每隔10秒处理一次
                                             if ((currentTime - lastBackgroundProcessTime) < 10000) {
                                                 return;
@@ -2007,6 +2011,7 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
             @Override
             public void run() {
                 if (livenessModel == null) {
+                    LogManager.logError(TAG, "livenessModel为空");
                     return;
                 }
 

app/src/main/java/com/ouxuan/oxface/device/Ox485.java

@@ -29,8 +29,8 @@ public class Ox485 {
     private static final String TAG = "Ox485";
     
     // 485通信配置
-    private static final String DEFAULT_SERIAL_PORT_PATH = "/dev/ttyS6"; //第6批设备
-    // private static final String DEFAULT_SERIAL_PORT_PATH = "/dev/ttys4"; //第7批设备
+//    private static final String DEFAULT_SERIAL_PORT_PATH = "/dev/ttyS6"; //第6批设备
+     private static final String DEFAULT_SERIAL_PORT_PATH = "/dev/ttyS4"; //第7批设备
     
     private static final int DEFAULT_BAUD_RATE = 9600;
     private static final int DEFAULT_STOP_BITS = 1;