From 77c62e023d2dc31200fc696158df84b3aee90ee7 Mon Sep 17 00:00:00 2001
From: DeteMin <43286838+DeteMin@users.noreply.github.com>
Date: 星期二, 31 三月 2020 16:18:56 +0800
Subject: [PATCH] 3-31:最后提交
---
app/src/main/java/com/basic/security/widget/RecognizeFaceInfoView.java | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/basic/security/widget/RecognizeFaceInfoView.java b/app/src/main/java/com/basic/security/widget/RecognizeFaceInfoView.java
index fa69814..9d8ebc9 100644
--- a/app/src/main/java/com/basic/security/widget/RecognizeFaceInfoView.java
+++ b/app/src/main/java/com/basic/security/widget/RecognizeFaceInfoView.java
@@ -18,14 +18,19 @@
import com.basic.security.manager.FaceTitleAndTipsManager;
import com.basic.security.manager.HintDoorAccessManager;
import com.basic.security.manager.HintSignUpManager;
+import com.basic.security.manager.IdentityManager;
import com.basic.security.manager.helper.rm.base.CurrentBase;
+import com.basic.security.model.ModelAdapter;
import com.basic.security.utils.Constants;
import com.basic.security.utils.FacePosition;
import com.basic.security.utils.FaceTitleAndTips;
+import java.util.ArrayList;
+import java.util.List;
+
public class RecognizeFaceInfoView extends FrameLayout {
LinearLayout recognized_face_info_view_layout;
- MyTextView face_title, tipsTxt;
+ MyTextView face_title, tipsTxt, face_title_tips;
FaceOuterBorderView face_border;
BaseShapeView scanner_view;
TextView face_background;
@@ -50,6 +55,7 @@
recognized_face_info_view_layout = view.findViewById(R.id.recognized_face_info_view_layout);
face_title = view.findViewById(R.id.face_title);
tipsTxt = view.findViewById(R.id.tipsTxt);
+ face_title_tips = view.findViewById(R.id.face_title_tips);
scanner_view = view.findViewById(R.id.scanner_view);
face_border = view.findViewById(R.id.face_border);
face_background = view.findViewById(R.id.face_background);
@@ -62,13 +68,35 @@
float pictureHeight) {
FaceTitleAndTips faceTitleAndTips = FaceTitleAndTipsManager.getFaceTitleMap(facePosition, true);
String faceTitle = faceTitleAndTips.getFaceTitle();
+ System.out.println("sout:showAtPosition:" + faceTitle);
face_title.setText(faceTitle);
+ String[] titles = faceTitle.trim().split("\\s+");
+// System.out.println("face_title:" + titles[0] + " tips:" + titles[titles.length-1]);
+ List<ModelAdapter> allIdentity = IdentityManager.findIdentityList();
+ ArrayList<String> temp = new ArrayList<String>();
+ for(ModelAdapter i:allIdentity){
+ temp.add(i.getString("name"));
+ }
+ if(temp.contains(titles[0])){
+ face_title.setText(titles[0] + " " + titles[1]);
+ }else{
+ face_title.setText(titles[0]);
+ }
+
+ if(titles.length >1){
+ face_title_tips.setText(titles[titles.length -1]);
+ face_title_tips.setTextColor(Color.WHITE);
+ }else{
+ face_title_tips.setText("");
+ face_title_tips.setVisibility(View.GONE);
+ }
+
tipsTxt.setText(faceTitleAndTips.getTipsTxt());
- tipsTxt.setTextColor1(Color.GREEN);
- tipsTxt.setTextColor(Color.GREEN);
- face_title.setTextColor(Color.GREEN);
- face_border.setBorderColor(Color.GREEN);
+// tipsTxt.setTextColor1(Color.GREEN);
+// tipsTxt.setTextColor(Color.GREEN);
+// face_title.setTextColor(Color.GREEN);
+// face_border.setBorderColor(Color.GREEN);
//System.out.println("RecognizeFaceInfoView.showAtPosition 0 " + (CurrentBase.activity.currentFragment == CurrentBase.activity.fragment_admin_face_login));
if (CurrentBase.activity.currentFragment == CurrentBase.activity.fragment_admin_face_login) {
try {
@@ -99,6 +127,7 @@
face_border.setBorderColor1(Color.parseColor("#FF0000"));
}
} else {
+// System.out.println("sout:reCalculate2");
face_title.setTextColor1(Color.parseColor(faceTitleAndTips.getFaceTitleColor()));
face_border.setBorderColor1(Color.parseColor(faceTitleAndTips.getFaceBorderColor()));
}
@@ -123,12 +152,14 @@
}
} else {
if (TextUtils.isEmpty(face_title.getText())
+ || "璇疯仈绯荤鐞嗗憳".equals(face_title.getText())
|| "鏈敞鍐�".equals(face_title.getText())
|| HintDoorAccessManager.getNoRegister().equals(face_title.getText())
) {
face_title.setTextColor1(Color.RED);
face_border.setBorderColor1(Color.RED);
} else {
+ System.out.println("sout:reCalculate3:"+face_title.getText());
face_title.setTextColor1(Color.GREEN);
face_border.setBorderColor1(Color.GREEN);
if (face_title.getCurrentTextColor1() == Color.GREEN) {
@@ -137,7 +168,6 @@
}
}
-
this.setVisibility(VISIBLE);
float faceLeft = facePosition.x1 * (cameraViewWidth / pictureWidth);
@@ -169,8 +199,24 @@
face_border.setVisibility(VISIBLE);
face_background.setVisibility(VISIBLE);
}
- if (!TextUtils.isEmpty(tipsTxt.getText().toString())) {
- face_title.setText("");
+// if (!TextUtils.isEmpty(tipsTxt.getText().toString())) {
+// face_title.setText("");
+// }
+
+ if(!TextUtils.isEmpty(face_title.getText().toString()) && !TextUtils.isEmpty(face_title_tips.getText().toString())
+ && face_border.getVisibility() == View.GONE ){
+ face_title_tips.setVisibility(View.VISIBLE);
+ if(face_border.getBorderColor1() == Color.GREEN){
+ face_title_tips.setBackgroundResource(R.drawable.radus_textview);
+ }
+ if(face_border.getBorderColor1() == Color.RED){
+ face_title_tips.setBackgroundResource(R.drawable.radius_text_red);
+ }
+ face_title.setTextColor(Color.WHITE);
+ face_title.setTextSize(70);
+ }else{
+ face_title_tips.setVisibility(View.GONE);
+ face_title.setTextSize(30);
}
}
}
--
Gitblit v1.8.0