.idea/codeStyles/Project.xml
New file @@ -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> .idea/misc.xml
New file @@ -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> .idea/modules.xml
New file @@ -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> .idea/runConfigurations.xml
New file @@ -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> .idea/vcs.xml
New file @@ -0,0 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="VcsDirectoryMappings"> <mapping directory="" vcs="Git" /> </component> </project> 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 "请联系管理员"; } } } 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) { 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; } } 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); } } } app/src/main/res/drawable/radius_text_red.xml
New file @@ -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> app/src/main/res/drawable/radus_textview.xml
New file @@ -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> 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" /> 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"/> 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"
