From 603cb36a5123e46656b06a5deb8d7ac7ff81307f Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 25 十二月 2019 08:48:51 +0800
Subject: [PATCH] a

---
 app/src/main/java/com/basic/security/widget/RecognizeFaceInfoViewS.java |  162 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 90 insertions(+), 72 deletions(-)

diff --git a/app/src/main/java/com/basic/security/widget/RecognizeFaceInfoViewS.java b/app/src/main/java/com/basic/security/widget/RecognizeFaceInfoViewS.java
index 3b912e6..8296d63 100644
--- a/app/src/main/java/com/basic/security/widget/RecognizeFaceInfoViewS.java
+++ b/app/src/main/java/com/basic/security/widget/RecognizeFaceInfoViewS.java
@@ -26,7 +26,7 @@
 
 public class RecognizeFaceInfoViewS extends FrameLayout {
     LinearLayout recognized_face_info_view_layout;
-    MyTextView face_title, tipsTxt;
+    MyTextView face_title, tipsTxt, face_title_top;
     FaceOuterBorderView face_border;
     BaseShapeView scanner_view;
     TextView face_background;
@@ -63,6 +63,7 @@
     private void initView() {
         View view = inflate(getContext(), com.basic.security.utils.ResolutionAdaptation.recognized_face_info_view(), null);
         recognized_face_info_view_layout = view.findViewById(com.basic.security.utils.RUtils.R_id_recognized_face_info_view_layout);
+        face_title_top = view.findViewById(com.basic.security.utils.RUtils.R_id_face_title_top);
         face_title = view.findViewById(com.basic.security.utils.RUtils.R_id_face_title);
         tipsTxt = view.findViewById(com.basic.security.utils.RUtils.R_id_tipsTxt);
         scanner_view = view.findViewById(com.basic.security.utils.RUtils.R_id_scanner_view);
@@ -78,76 +79,81 @@
         MainActivity mainActivity = (MainActivity) BaseApplication.getApplication().activity;
         FaceTitleAndTipsS faceTitleAndTips = FaceTitleAndTipsManagerS.getFaceTitleMap(facePosition, true);
         String faceTitle = faceTitleAndTips.getFaceTitle();
-        face_title.setText(faceTitle);
-        tipsTxt.setText(faceTitleAndTips.getTipsTxt());
-        tipsTxt.setTextColor1(Color.GREEN);
-        tipsTxt.setTextColor(Color.GREEN);
-        if (faceTitleAndTips.getFaceTitleColor().equals("#00FF00")) {
-            face_title.setTextColor(Color.GREEN);
-            face_border.setBorderColor(Color.GREEN);
-        } else {
-            face_title.setTextColor(Color.RED);
-            face_border.setBorderColor(Color.RED);
-        }
-        if (CurrentBase.activity.currentFragment == CurrentBase.activity.fragment_door_access_result) {
-            if ("寮�闂ㄦ垚鍔�".equals(((DoorAccessResultFragment) CurrentBase.activity.fragment_door_access_result).openDoorTitle())) {
-                face_title.setTextColor1(Color.parseColor("#00FF00"));
-                face_border.setBorderColor1(Color.parseColor("#00FF00"));
-            } else {
-                face_title.setTextColor1(Color.parseColor("#FF0000"));
-                face_border.setBorderColor1(Color.parseColor("#FF0000"));
-            }
-        } else {
-            face_title.setTextColor1(Color.parseColor(faceTitleAndTips.getFaceTitleColor()));
-            face_border.setBorderColor1(Color.parseColor(faceTitleAndTips.getFaceBorderColor()));
-        }
-        ModelAdapter currentPositionPerson = faceTitleAndTips.person;
-        if (mainActivity.currentFragment == mainActivity.fragment_guest_mode) {
-            if (currentPositionPerson == null || "鏈敞鍐�".equals(currentPositionPerson.getString(Person.sign_up_status))) {
-                face_title.setTextColor1(Color.RED);
-                face_border.setBorderColor1(Color.RED);
-                face_title.setText(HintDoorAccessManager.getNoRegisterHint());
-            }
-        }
-        if (mainActivity.currentFragment == mainActivity.fragment_su_auto_wait_face
-                || mainActivity.currentFragment == mainActivity.fragment_door_access_result
-                ) {
-            if (face_title.getCurrentTextColor1() == Color.RED) {
-                if (!faceTitle.equals(HintSignUpManager.getAdminLogoutHint())
-                        && !faceTitle.contains(HintDoorAccessManager.getSignUpRuleDoorAccessTimeDeniedMessage(null))
-                        && !faceTitle.equals("璁垮")
-                        ) {
-                    face_title.setText("");
-                }
-            }
-            if (TextUtils.isEmpty(face_title.getText())) {
-                face_title.setTextColor1(Color.RED);
-                face_border.setBorderColor1(Color.RED);
-            }
-            if (face_title.getCurrentTextColor1() == Color.GREEN) {
-                tipsTxt.setText("");
-            }
-        } else {
-            if (TextUtils.isEmpty(face_title.getText())
-                    || "鏈敞鍐�".equals(face_title.getText())
-                    || HintDoorAccessManager.getNoRegisterHint().equals(face_title.getText())
-                    || faceTitle.endsWith(HintDoorAccessManager.getSignUpRuleDoorAccessTimeDeniedMessage(null))
-                    || faceTitle.endsWith(HintDoorAccessManager.getSignUpRuleDoorAccessTimeNotReachMessage(null, null))
-                    ) {
-                face_title.setTextColor1(Color.RED);
-                face_border.setBorderColor1(Color.RED);
-            } else {
-                face_title.setTextColor1(Color.GREEN);
-                face_border.setBorderColor1(Color.GREEN);
-                if (face_title.getCurrentTextColor1() == Color.GREEN) {
-                    tipsTxt.setText("");
-                }
-            }
-        }
         if (faceTitleAndTips.facePosition != null && Constants.USE_GRAY_CAMERA && !facePosition.liveness) {
             face_title.setTextColor1(Color.RED);
             face_border.setBorderColor1(Color.RED);
-            face_title.setText("闈炴椿浣�");
+            faceTitle = "闈炴椿浣�";
+            face_title.setText1(faceTitle);
+        } else {
+            face_title.setText1(faceTitle);
+            tipsTxt.setText(faceTitleAndTips.getTipsTxt());
+            tipsTxt.setTextColor1(Color.GREEN);
+            tipsTxt.setTextColor(Color.GREEN);
+            if (faceTitleAndTips.getFaceTitleColor().equals("#00FF00")) {
+                face_title.setTextColor(Color.GREEN);
+                face_border.setBorderColor(Color.GREEN);
+            } else {
+                face_title.setTextColor(Color.RED);
+                face_border.setBorderColor(Color.RED);
+            }
+            if (CurrentBase.activity.currentFragment == CurrentBase.activity.fragment_door_access_result) {
+                if ("寮�闂ㄦ垚鍔�".equals(((DoorAccessResultFragment) CurrentBase.activity.fragment_door_access_result).openDoorTitle())) {
+                    face_title.setTextColor1(Color.parseColor("#00FF00"));
+                    face_border.setBorderColor1(Color.parseColor("#00FF00"));
+                } else {
+                    face_title.setTextColor1(Color.parseColor("#FF0000"));
+                    face_border.setBorderColor1(Color.parseColor("#FF0000"));
+                }
+            } else {
+                face_title.setTextColor1(Color.parseColor(faceTitleAndTips.getFaceTitleColor()));
+                face_border.setBorderColor1(Color.parseColor(faceTitleAndTips.getFaceBorderColor()));
+            }
+            ModelAdapter currentPositionPerson = faceTitleAndTips.person;
+            if (mainActivity.currentFragment == mainActivity.fragment_guest_mode) {
+                if (currentPositionPerson == null || "鏈敞鍐�".equals(currentPositionPerson.getString(Person.sign_up_status))) {
+                    face_title.setTextColor1(Color.RED);
+                    face_border.setBorderColor1(Color.RED);
+                    face_title.setText1(HintDoorAccessManager.getNoRegisterHint());
+                }
+            }
+            if (mainActivity.currentFragment == mainActivity.fragment_su_auto_wait_face
+                    || mainActivity.currentFragment == mainActivity.fragment_door_access_result
+                    ) {
+                if (face_title.getCurrentTextColor1() == Color.RED) {
+                    if (!faceTitle.equals(HintSignUpManager.getAdminLogoutHint())
+                            && !faceTitle.contains(HintDoorAccessManager.getSignUpRuleDoorAccessTimeDeniedMessage(null))
+                            && !faceTitle.equals("璁垮")
+                            ) {
+                        face_title.setText1("");
+                    }
+                }
+                if (TextUtils.isEmpty(face_title.getText())) {
+                    face_title.setTextColor1(Color.RED);
+                    face_border.setBorderColor1(Color.RED);
+                }
+                if (face_title.getCurrentTextColor1() == Color.GREEN) {
+                    tipsTxt.setText("");
+                }
+            } else {
+                if (TextUtils.isEmpty(face_title.getText())
+                        || "鏈敞鍐�".equals(face_title.getText())
+                        || HintDoorAccessManager.getNoRegisterHint().equals(face_title.getText())
+                        || faceTitle.endsWith(HintDoorAccessManager.getSignUpRuleDoorAccessTimeDeniedMessage(null))
+                        || faceTitle.endsWith(HintDoorAccessManager.getSignUpRuleDoorAccessTimeNotReachMessage(null, null))
+                        ) {
+                    face_title.setTextColor1(Color.RED);
+                    face_border.setBorderColor1(Color.RED);
+                } else {
+                    face_title.setTextColor1(Color.GREEN);
+                    face_border.setBorderColor1(Color.GREEN);
+                    if (face_title.getCurrentTextColor1() == Color.GREEN) {
+                        tipsTxt.setText("");
+                    }
+                }
+            }
+            if (!TextUtils.isEmpty(tipsTxt.getText().toString())) {
+                face_title.setText1("");
+            }
         }
         this.setVisibility(VISIBLE);
         float faceLeft = facePosition.sx1 * (cameraViewWidth / pictureWidth);
@@ -162,7 +168,18 @@
         } catch (Exception e) {
             e.printStackTrace();
         }
-        float faceHeight = (facePosition.sy2 - facePosition.sy1) * (cameraViewHeight / pictureHeight);
+        double faceHeight = (facePosition.sy2 - facePosition.sy1) * (cameraViewHeight / pictureHeight);
+        if (scanner_view instanceof CircleView) {
+            double face_title_top_height = (faceHeight - faceWidth) * 0.4;
+            if (face_title_top_height < 0) {
+                face_title_top_height = 0;
+            }
+            face_title_top.setVisibility(VISIBLE);
+            ViewGroup.LayoutParams layoutParams3 = face_title_top.getLayoutParams();
+            layoutParams3.height = (int) (face_title_top_height / 2);
+            face_title_top.setLayoutParams(layoutParams3);
+            faceHeight = faceHeight - face_title_top_height;
+        }
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams((int) faceWidth, (int) faceHeight);
         RelativeLayout.LayoutParams layoutParams1 =
                 new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -175,6 +192,8 @@
         scanner_view.setLayoutParams(layoutParams);
         face_background.setLayoutParams(layoutParams);
         if (scanner_view instanceof CircleView) {
+
+
             face_border.setVisibility(GONE);
             tipsTxt.setTextColor(face_title.getCurrentTextColor1());
             face_title.setTextColor(face_title.getCurrentTextColor1());
@@ -184,8 +203,7 @@
             face_border.setVisibility(VISIBLE);
             face_background.setVisibility(VISIBLE);
         }
-        if (!TextUtils.isEmpty(tipsTxt.getText().toString())) {
-            face_title.setText("");
-        }
+//        System.out.println("MyTextView.setText1 11 " + face_title.getText().toString());
+
     }
 }

--
Gitblit v1.8.0