.idea/codeStyles/Project.xml
@@ -1,113 +1,29 @@ <component name="ProjectCodeStyleConfiguration"> <code_scheme name="Project" version="173"> <codeStyleSettings language="XML"> <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 name="ProjectCodeStyleConfiguration"> <code_scheme name="Project" version="173"> <Objective-C-extensions> <file> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" /> </file> <class> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" /> <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" /> </class> <extensions> <pair source="cpp" header="h" fileNamingConvention="NONE" /> <pair source="c" header="h" fileNamingConvention="NONE" /> </extensions> </Objective-C-extensions> </code_scheme> </component> .idea/misc.xml
@@ -5,22 +5,26 @@ <option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> <option name="myNullables"> <value> <list size="5"> <list size="7"> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" /> <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" /> <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" /> <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" /> <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" /> <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" /> </list> </value> </option> <option name="myNotNulls"> <value> <list size="4"> <list size="6"> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" /> <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" /> <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" /> <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" /> <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" /> </list> </value> </option> .idea/vcs.xml
@@ -2,7 +2,12 @@ <project version="4"> <component name="VcsDirectoryMappings"> <mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="$PROJECT_DIR$/bin" vcs="Git" /> <mapping directory="$PROJECT_DIR$/bin/androidSync/androidSync" vcs="Git" /> <mapping directory="$PROJECT_DIR$/IDCardReader" vcs="svn" /> <mapping directory="$PROJECT_DIR$/android-file-chooser" vcs="svn" /> <mapping directory="$PROJECT_DIR$/app" vcs="svn" /> <mapping directory="$PROJECT_DIR$/basic_common" vcs="svn" /> <mapping directory="$PROJECT_DIR$/iolibrary" vcs="svn" /> <mapping directory="$PROJECT_DIR$/pickerview" vcs="svn" /> <mapping directory="$PROJECT_DIR$/wheelview" vcs="svn" /> </component> </project> IDCardReader/build.gradle
@@ -28,7 +28,7 @@ jniLibs.srcDirs = ['libs'] } } buildToolsVersion = '27.0.3' buildToolsVersion = '28.0.3' }
@@ -27,7 +27,7 @@ lintOptions { abortOnError false } buildToolsVersion = '27.0.3' buildToolsVersion = '28.0.3' } dependencies { app/build.gradle
@@ -62,8 +62,8 @@ testOptions { unitTests.returnDefaultValues = true } buildToolsVersion = '27.0.3' buildToolsVersion '27.0.3' buildToolsVersion = '28.0.3' buildToolsVersion '28.0.3' } //apply plugin: 'org.greenrobot.greendao' app/src/main/java/com/basic/security/manager/IdentityManager.java
@@ -15,6 +15,7 @@ import java.util.UUID; public class IdentityManager extends BaseManager { public static List<ModelAdapter> findIdentityList() { return findList("select * from identity "); } app/src/main/java/com/basic/security/utils/RUtils.java
@@ -210,6 +210,7 @@ public static final int R_layout_recognized_face_info_view = com.basic.security.yuyin.outdoor.R.layout.recognized_face_info_view; public static final int R_id_recognized_face_info_view_layout = com.basic.security.yuyin.outdoor.R.id.recognized_face_info_view_layout; public static final int R_id_face_title = com.basic.security.yuyin.outdoor.R.id.face_title; public static final int R_id_face_title_tips = com.basic.security.yuyin.outdoor.R.id.face_title_tips; public static final int R_id_face_title_top = R.id.face_title_top; public static final int R_id_tipsTxt = com.basic.security.yuyin.outdoor.R.id.tipsTxt; public static final int R_id_scanner_view = com.basic.security.yuyin.outdoor.R.id.scanner_view; app/src/main/java/com/basic/security/widget/FaceOuterBorderView.java
@@ -89,4 +89,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
@@ -16,17 +16,26 @@ 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.model.Person; import com.basic.security.utils.Constants; import com.basic.security.utils.FacePosition; import com.basic.security.utils.FaceTitleAndTips; import com.basic.security.yuyin.outdoor.R; import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; import java.util.List; public class RecognizeFaceInfoView extends FrameLayout { public static long stopDrawFaceRect; LinearLayout recognized_face_info_view_layout; MyTextView face_title, tipsTxt, face_title_top; MyTextView face_title, tipsTxt, face_title_top, face_title_tips; FaceOuterBorderView face_border; BaseShapeView scanner_view; TextView face_background; @@ -51,6 +60,7 @@ 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); face_title_tips = view.findViewById(com.basic.security.utils.RUtils.R_id_face_title_tips); tipsTxt = view.findViewById(com.basic.security.utils.RUtils.R_id_tipsTxt); scanner_view = view.findViewById(com.basic.security.utils.RUtils.R_id_scanner_view); face_border = view.findViewById(com.basic.security.utils.RUtils.R_id_face_border); @@ -68,18 +78,52 @@ MainActivity mainActivity = (MainActivity) BaseApplication.getApplication().activity; FaceTitleAndTips faceTitleAndTips = FaceTitleAndTipsManager.getFaceTitleMap(facePosition, true); String faceTitle = faceTitleAndTips.getFaceTitle(); face_title.setText(faceTitle); String[] titles = faceTitle.trim().split("\\s+"); // System.out.println("faceTitle:"+ faceTitle + "; tips:"+ titles[0]); 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]); } // for(String t:temp){ // System.out.println("face_title:"+ t); // } 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_title.setTextColor(Color.WHITE); face_border.setBorderColor(Color.GREEN); if (CurrentBase.activity.currentFragment == CurrentBase.activity.fragment_door_access_result) { if ("开门成功".equals((CurrentBase.activity.fragment_door_access_result).openDoorTitle())) { face_title.setTextColor1(Color.parseColor("#00FF00")); if(titles.length > 1){ face_title.setTextColor(Color.WHITE); }else{ face_title.setTextColor1(Color.parseColor("#00FF00")); } face_title_tips.setBackgroundResource(R.drawable.radus_textview); face_border.setBorderColor1(Color.parseColor("#00FF00")); } else { face_title.setTextColor1(Color.parseColor("#FF0000")); if(titles.length > 1){ face_title.setTextColor(Color.WHITE); }else{ face_title.setTextColor1(Color.parseColor("#FF0000")); } face_title_tips.setBackgroundResource(R.drawable.radius_text_red); face_border.setBorderColor1(Color.parseColor("#FF0000")); } } else { @@ -99,6 +143,7 @@ } if (TextUtils.isEmpty(face_title.getText())) { face_title.setTextColor1(Color.RED); face_title_tips.setBackgroundResource(R.drawable.radius_text_red); face_border.setBorderColor1(Color.RED); } if (face_title.getCurrentTextColor1() == Color.GREEN) { @@ -113,9 +158,11 @@ ) { face_title.setTextColor1(Color.RED); face_border.setBorderColor1(Color.RED); face_title_tips.setBackgroundResource(R.drawable.radius_text_red); } else { face_title.setTextColor1(Color.GREEN); face_border.setBorderColor1(Color.GREEN); face_title_tips.setBackgroundResource(R.drawable.radus_textview); if (face_title.getCurrentTextColor1() == Color.GREEN) { tipsTxt.setText(""); } @@ -131,11 +178,13 @@ face_title.setText(HintSignUpManager.getNoVerificationIDCardHint()); face_title.setTextColor1(Color.GREEN); face_border.setBorderColor1(Color.GREEN); face_title_tips.setBackgroundResource(R.drawable.radus_textview); } if (mainActivity.currentFragment == mainActivity.fragment_su_logged_ic_compare_success) { face_title.setText(HintSignUpManager.getImperfectHint()); face_title.setTextColor1(Color.GREEN); face_border.setBorderColor1(Color.GREEN); face_title_tips.setBackgroundResource(R.drawable.radus_textview); } } } @@ -143,16 +192,19 @@ if (currentPositionPerson == null || "未注册".equals(currentPositionPerson.getString(Person.sign_up_status))) { face_title.setTextColor1(Color.RED); face_border.setBorderColor1(Color.RED); face_title_tips.setBackgroundResource(R.drawable.radius_text_red); face_title.setText(HintDoorAccessManager.getNoRegisterHint()); } } if (faceTitle.equals(HintSignUpManager.getAdminLogoutHint())) { face_title.setTextColor1(Color.RED); face_border.setBorderColor1(Color.RED); face_title_tips.setBackgroundResource(R.drawable.radius_text_red); } if (faceTitleAndTips.facePosition != null && Constants.USE_GRAY_CAMERA && !facePosition.liveness) { face_title.setTextColor1(Color.RED); face_border.setBorderColor1(Color.RED); face_title_tips.setBackgroundResource(R.drawable.radius_text_red); face_title.setText("非活体"); } this.setVisibility(VISIBLE); @@ -197,9 +249,29 @@ } else { face_border.setVisibility(VISIBLE); face_background.setVisibility(VISIBLE); } 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(100); }else{ face_title_tips.setVisibility(View.GONE); face_title.setTextSize(50); } // System.out.println("face_title:"+ face_title.getText() + " || " + View.VISIBLE + " || "+View.GONE + " || "+View.INVISIBLE); // System.out.println("face_title:"+face_border.getBorderColor1()+" ; Color:"+Color.GREEN+"||"+Color.RED); } } 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/recognized_face_info_view.xml
@@ -12,13 +12,14 @@ android:id="@+id/face_title_top" android:layout_width="match_parent" android:layout_height="1px" /> <com.basic.security.widget.MyTextView android:id="@+id/face_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_vertical|center_horizontal" android:text="" android:textSize="@dimen/h28" /> android:textSize="@dimen/h35" /> <RelativeLayout android:layout_width="wrap_content" @@ -41,6 +42,15 @@ 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="300dp" android:layout_gravity="center_horizontal|bottom" android:text="" android:visibility="gone" android:textSize="@dimen/h28" /> <com.basic.security.widget.FaceOuterBorderView android:id="@+id/face_border" @@ -55,7 +65,22 @@ android:layout_gravity="center_horizontal" android:paddingTop="@dimen/h8" android:text="" android:visibility="gone" android:textSize="@dimen/h28" /> </LinearLayout> <!--<LinearLayout--> <!--android:layout_width="wrap_content"--> <!--android:layout_height="wrap_content"--> <!--android:orientation="horizontal">--> <!--<com.basic.security.widget.MyTextView--> <!--android:id="@+id/face_title"--> <!--android:layout_width="wrap_content"--> <!--android:layout_height="wrap_content"--> <!--android:layout_gravity="center_horizontal|bottom"--> <!--android:text=""--> <!--android:textSize="@dimen/h28" />--> <!--</LinearLayout>--> </RelativeLayout> app/src/main/res/values/colors.xml
@@ -37,6 +37,7 @@ <color name="press_menu_text">#235563</color> <color name="white">#FFFFFFFF</color> <color name="tianlan">#5DADE2</color> <color name="colorBlack">#000</color> <color name="black">#000</color> build.gradle
@@ -13,7 +13,7 @@ maven { url 'https://jitpack.io' } } dependencies { classpath 'com.android.tools.build:gradle:3.1.2' classpath 'com.android.tools.build:gradle:3.2.1' classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2' classpath "io.objectbox:objectbox-gradle-plugin:2.1.0" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists #Fri Jan 10 12:02:10 CST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
