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/res/layout/fragment_hint_sign_up.xml | 2
app/src/main/res/drawable/radus_textview.xml | 10 ++
app/src/main/res/layout/fragment_su_auto_wait_admin.xml | 2
.idea/codeStyles/Project.xml | 116 +++++++++++++++++++++++
.idea/misc.xml | 9 +
app/src/main/java/com/basic/security/utils/FaceTitleAndTips.java | 2
app/src/main/res/layout/recognized_face_info_view.xml | 17 ++
.idea/vcs.xml | 6 +
.idea/modules.xml | 12 ++
app/src/main/java/com/basic/security/widget/RecognizeFaceInfoView.java | 62 ++++++++++-
app/src/main/java/com/basic/security/widget/FaceOuterBorderView.java | 2
.idea/runConfigurations.xml | 12 ++
app/src/main/res/drawable/radius_text_red.xml | 10 ++
app/src/main/java/com/basic/security/manager/HintSignUpManager.java | 4
14 files changed, 250 insertions(+), 16 deletions(-)
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..681f41a
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+ <code_scheme name="Project" version="173">
+ <codeStyleSettings language="XML">
+ <indentOptions>
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ </indentOptions>
+ <arrangement>
+ <rules>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>xmlns:android</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>^$</XML_NAMESPACE>
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>xmlns:.*</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>^$</XML_NAMESPACE>
+ </AND>
+ </match>
+ <order>BY_NAME</order>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>.*:id</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>.*:name</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>name</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>^$</XML_NAMESPACE>
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>style</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>^$</XML_NAMESPACE>
+ </AND>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>.*</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>^$</XML_NAMESPACE>
+ </AND>
+ </match>
+ <order>BY_NAME</order>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>.*</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+ </AND>
+ </match>
+ <order>ANDROID_ATTRIBUTE_ORDER</order>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <AND>
+ <NAME>.*</NAME>
+ <XML_ATTRIBUTE />
+ <XML_NAMESPACE>.*</XML_NAMESPACE>
+ </AND>
+ </match>
+ <order>BY_NAME</order>
+ </rule>
+ </section>
+ </rules>
+ </arrangement>
+ </codeStyleSettings>
+ </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..7bfef59
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/build/classes" />
+ </component>
+ <component name="ProjectType">
+ <option name="id" value="Android" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..c1040cb
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/IDCardReader/IDCardReader.iml" filepath="$PROJECT_DIR$/IDCardReader/IDCardReader.iml" />
+ <module fileurl="file://$PROJECT_DIR$/Security_simplify_gpu_V10.8.0_v2_black.iml" filepath="$PROJECT_DIR$/Security_simplify_gpu_V10.8.0_v2_black.iml" />
+ <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+ <module fileurl="file://$PROJECT_DIR$/apprtc/apprtc.iml" filepath="$PROJECT_DIR$/apprtc/apprtc.iml" />
+ <module fileurl="file://$PROJECT_DIR$/iolibrary/iolibrary.iml" filepath="$PROJECT_DIR$/iolibrary/iolibrary.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..7f68460
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RunConfigurationProducerService">
+ <option name="ignoredProducers">
+ <set>
+ <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+ <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+ <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+ </set>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/basic/security/manager/HintSignUpManager.java b/app/src/main/java/com/basic/security/manager/HintSignUpManager.java
index 1193ec8..32a1813 100644
--- a/app/src/main/java/com/basic/security/manager/HintSignUpManager.java
+++ b/app/src/main/java/com/basic/security/manager/HintSignUpManager.java
@@ -23,7 +23,7 @@
hintSignUpMessage.setString("id_card_fail", "韬唤璇侀獙璇佸け璐�");
hintSignUpMessage.setString("edit_message", "璇峰畬鍠勪俊鎭�");
hintSignUpMessage.setString("register_success", "娉ㄥ唽鎴愬姛");
- hintSignUpMessage.setString("admin_logout", "璇疯仈绯荤鐞嗗憳涓烘偍娉ㄥ唽");
+ hintSignUpMessage.setString("admin_logout", "璇疯仈绯荤鐞嗗憳");
hintSignUpMessage.setString("device_id", DeviceManager.getDeviceId());
hintSignUpMessage.setString("table", "hint_sign_up");
BaseManager.save(hintSignUpMessage);
@@ -113,7 +113,7 @@
if (hintSignUpMessage != null && !TextUtils.isEmpty(hintSignUpMessage.getString("admin_logout"))) {
return hintSignUpMessage.getString("admin_logout");
} else {
- return "璇疯仈绯荤鐞嗗憳涓烘偍娉ㄥ唽";
+ return "璇疯仈绯荤鐞嗗憳";
}
}
}
diff --git a/app/src/main/java/com/basic/security/utils/FaceTitleAndTips.java b/app/src/main/java/com/basic/security/utils/FaceTitleAndTips.java
index 4f8e4bb..d29cd12 100644
--- a/app/src/main/java/com/basic/security/utils/FaceTitleAndTips.java
+++ b/app/src/main/java/com/basic/security/utils/FaceTitleAndTips.java
@@ -23,8 +23,8 @@
tipsTxt = "";
}
-
if (!TextUtils.isEmpty(faceTitle()) && validBusinessRuleList.size() > 0) {
+ System.out.println("sout:reCalculate");
setFaceTitleGreenColor();
}
} catch (Exception e) {
diff --git a/app/src/main/java/com/basic/security/widget/FaceOuterBorderView.java b/app/src/main/java/com/basic/security/widget/FaceOuterBorderView.java
index 0f87e66..988836b 100644
--- a/app/src/main/java/com/basic/security/widget/FaceOuterBorderView.java
+++ b/app/src/main/java/com/basic/security/widget/FaceOuterBorderView.java
@@ -86,4 +86,6 @@
public void setBorderColor1(int borderColor1) {
this.borderColor1 = borderColor1;
}
+
+ public int getBorderColor1(){ return this.borderColor1; }
}
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);
}
}
}
diff --git a/app/src/main/res/drawable/radius_text_red.xml b/app/src/main/res/drawable/radius_text_red.xml
new file mode 100644
index 0000000..7eaeed9
--- /dev/null
+++ b/app/src/main/res/drawable/radius_text_red.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="5dp" />
+ <padding android:bottom="2dp"
+ android:left="2dp"
+ android:right="2dp"
+ android:top="2dp"></padding>
+ <solid android:color="@color/colorRed" />
+ <stroke android:width="1dip" android:color="@color/colorRed" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/radus_textview.xml b/app/src/main/res/drawable/radus_textview.xml
new file mode 100644
index 0000000..819a61e
--- /dev/null
+++ b/app/src/main/res/drawable/radus_textview.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="5dp" />
+ <padding android:bottom="2dp"
+ android:left="2dp"
+ android:right="2dp"
+ android:top="2dp"></padding>
+ <solid android:color="@color/colorGreen" />
+ <stroke android:width="1dip" android:color="@color/colorGreen" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_hint_sign_up.xml b/app/src/main/res/layout/fragment_hint_sign_up.xml
index dd6fdb8..826966c 100644
--- a/app/src/main/res/layout/fragment_hint_sign_up.xml
+++ b/app/src/main/res/layout/fragment_hint_sign_up.xml
@@ -182,7 +182,7 @@
android:layout_marginLeft="@dimen/w24"
android:layout_marginRight="@dimen/w60"
android:gravity="center"
- android:hint="璇疯仈绯荤鐞嗗憳涓烘偍娉ㄥ唽"
+ android:hint="璇疯仈绯荤鐞嗗憳"
android:paddingLeft="@dimen/w15"
android:textColor="@color/colorWhite"
android:textSize="@dimen/font_size_21" />
diff --git a/app/src/main/res/layout/fragment_su_auto_wait_admin.xml b/app/src/main/res/layout/fragment_su_auto_wait_admin.xml
index 6dea137..09563f2 100644
--- a/app/src/main/res/layout/fragment_su_auto_wait_admin.xml
+++ b/app/src/main/res/layout/fragment_su_auto_wait_admin.xml
@@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/h30"
- android:text="璇疯仈绯荤鐞嗗憳涓烘偍娉ㄥ唽"
+ android:text="璇疯仈绯荤鐞嗗憳"
android:textColor="@color/colorWhite"
android:textSize="@dimen/font_size_25"
android:visibility="invisible"/>
diff --git a/app/src/main/res/layout/recognized_face_info_view.xml b/app/src/main/res/layout/recognized_face_info_view.xml
index 80c3485..7189d08 100644
--- a/app/src/main/res/layout/recognized_face_info_view.xml
+++ b/app/src/main/res/layout/recognized_face_info_view.xml
@@ -27,9 +27,20 @@
android:layout_marginTop="@dimen/h137"
android:background="#3374F8F5" />
<com.basic.security.widget.CircleView
- android:id="@+id/scanner_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ android:id="@+id/scanner_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ <com.basic.security.widget.MyTextView
+ android:id="@+id/face_title_tips"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="200dp"
+ android:layout_gravity="center_horizontal|bottom"
+ android:text=""
+ android:visibility="gone"
+ android:textSize="@dimen/h34" />
+
<com.basic.security.widget.FaceOuterBorderView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
--
Gitblit v1.8.0