1.处理人脸拉取超时

app/build.gradle

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

app/src/main/java/http/OkHttpUtils.java

@@ -36,4 +36,22 @@ public class OkHttpUtils {
         Call call = client.newCall(request);
         return call.execute();
     }
+
+    //可以设置超时时间 timeoutMillis 毫秒
+    public static Response postSync(String url, String json, long timeoutMillis) throws IOException {
+        // 用新 client 覆盖超时设置
+        OkHttpClient timeoutClient = client.newBuilder()
+                .connectTimeout(timeoutMillis, java.util.concurrent.TimeUnit.MILLISECONDS)
+                .readTimeout(timeoutMillis, java.util.concurrent.TimeUnit.MILLISECONDS)
+                .writeTimeout(timeoutMillis, java.util.concurrent.TimeUnit.MILLISECONDS)
+                .build();
+
+        RequestBody body = RequestBody.create(JSON, json);
+        Request request = new Request.Builder()
+                .url(url)
+                .post(body)
+                .build();
+
+        return timeoutClient.newCall(request).execute();
+    }
 }

app/src/main/java/http/client/ApiRepository.kt

@@ -276,6 +276,8 @@ object ApiRepository {
                 }
                 buildName = middle.buildName
                 room = middle.room
+                safetyLiaisonName = middle.safetyLiaisonName
+                safetyLiaisonPhone = middle.safetyLiaisonPhone
                 // 责任单位、实验室负责人
                 val safePersons = mutableListOf(
                     LaboratoryVo.SafePersonInfo("责任单位：", middle.deptName),

app/src/main/java/http/client/HttpTool.java

@@ -66,7 +66,7 @@ public final class HttpTool {
             LabConfig labConfig = RoomTool.getInstance().labConfigDao().getLabConfig();
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("subId", labConfig.getLabId());
-            return OkHttpUtils.postSync(deviceConfig.getBaseUrl() + "terminal/sys/face/data/sub", jsonObject.toString());
+            return OkHttpUtils.postSync(deviceConfig.getBaseUrl() + "terminal/sys/face/data/sub", jsonObject.toString(), 300000);
         } catch (Exception e) {
             LogUtils.e(Log.getStackTraceString(e));
         }

app/src/main/java/http/vo/response/HomeMiddleResp.java

@@ -26,6 +26,9 @@ public class HomeMiddleResp {
     public List<LaboratoryVo.InCheckItem> inspectInCheck; // AI检测项(巡查)
     public List<String> outCheck; // 离开检查项
 
+    public String safetyLiaisonName;
+    public String safetyLiaisonPhone;
+
     public static class SafeUserVo {
         public String id;
         public String safeUserName;

app/src/main/java/http/vo/response/LaboratoryVo.java

@@ -35,6 +35,8 @@ public class LaboratoryVo {
     public String safeUserDesc; // 安全责任人
     public String buildName; // 楼栋名称
     public String room; // 房间号
+    public String safetyLiaisonName;  //安全联络员名字
+    public String safetyLiaisonPhone; // 安全联络员电话;
 
     public List<SafeClassify> safeClassifyList;
     public List<String> specialClassify;

app/src/main/java/xn/xxp/home/sign/SafetyCheckFragment.kt

@@ -184,6 +184,8 @@ class SafetyCheckFragment :
             .cameraErrorCallback { onError(it.message) }
             .logger(loggers(logcat(), fileLogger(requireActivity())))
             .build()
+         // 👇 加这一行：旋转预览视图，解决前置摄像头上下颠倒
+         //viewBinding.cameraView.rotation = 180f
 
         // 开始检测
         viewBinding.startCheck.setOnClickListener {

app/src/main/java/xn/xxp/home/window/WindowFragment.java

@@ -107,14 +107,37 @@ public class WindowFragment extends RcBaseFragment<FragmentWindowBinding> {
         binding.unitNameTV.setText(TextUtils.isEmpty(lab.deptName) ? "" : lab.deptName);
         // 实验室名称
         binding.labNameTV.setText(TextUtils.isEmpty(lab.subName) ? "" : lab.subName);
+        String adminNamePhone = "";
+        if (!TextUtils.isEmpty(lab.adminName) && !TextUtils.isEmpty(lab.adminPhone)){
+            adminNamePhone = lab.adminName+"("+lab.adminPhone+")";
+        }else if (!TextUtils.isEmpty(lab.adminName) && TextUtils.isEmpty(lab.adminPhone)){
+            adminNamePhone = lab.adminName;
+        }else if (TextUtils.isEmpty(lab.adminName) && !TextUtils.isEmpty(lab.adminPhone)){
+            adminNamePhone = lab.adminPhone;
+        }else if (TextUtils.isEmpty(lab.adminName) && TextUtils.isEmpty(lab.adminPhone)){
+            adminNamePhone = "";
+        }
         // 实验室负责人
-        binding.labLeaderTV.setText(TextUtils.isEmpty(lab.adminName) ? "" : lab.adminName);
+        binding.labLeaderTV.setText(adminNamePhone);
         // 楼宇
         binding.buildingNameTV.setText(TextUtils.isEmpty(lab.buildName) ? "" : lab.buildName);
         // 房间号
         binding.roomNOTV.setText(TextUtils.isEmpty(lab.room) ? "" : lab.room);
         // 实验室负责人电话
-        binding.leaderPhoneTV.setText(TextUtils.isEmpty(lab.adminPhone) ? "" : lab.adminPhone);
+
+        String safetyLiaisonPhone = "";
+        if (!TextUtils.isEmpty(lab.safetyLiaisonName) && !TextUtils.isEmpty(lab.safetyLiaisonPhone)){
+            safetyLiaisonPhone = lab.safetyLiaisonName+"("+lab.safetyLiaisonPhone+")";
+        }else if (!TextUtils.isEmpty(lab.safetyLiaisonName) && TextUtils.isEmpty(lab.safetyLiaisonPhone)){
+            safetyLiaisonPhone = lab.safetyLiaisonName;
+        }else if (TextUtils.isEmpty(lab.safetyLiaisonName) && !TextUtils.isEmpty(lab.safetyLiaisonPhone)){
+            safetyLiaisonPhone = lab.safetyLiaisonPhone;
+        }else if (TextUtils.isEmpty(lab.safetyLiaisonName) && TextUtils.isEmpty(lab.safetyLiaisonPhone)){
+            safetyLiaisonPhone = "";
+        }
+        //安全联络员名字电话
+        binding.leaderPhoneTV.setText(safetyLiaisonPhone);
+        //binding.safetyLiaisonNameTV.setText(TextUtils.isEmpty(lab.safetyLiaisonName) ? "" : lab.safetyLiaisonName);
         // 实验室二维码
         if (!TextUtils.isEmpty(lab.qrCodeUrl)) {
             ThreadUtils.executeByCached(new ThreadUtils.SimpleTask<Bitmap>() {

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="horizontal"
     android:paddingEnd="18px"
     tools:background="#073388"
     tools:ignore="PxUsage,RtlSymmetry">
@@ -202,7 +203,7 @@
                         android:layout_marginStart="18px"
                         android:layout_weight="1"
                         android:gravity="center"
-                        android:text="负责人电话"
+                        android:text="安全联络人"
                         android:textColor="#333333"
                         android:textSize="24px" />