覆盖式注册人脸

app/app.iml

@@ -103,21 +103,21 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.1.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/temp2/jswlibrary_android_rfid/app/libs/gson-2.8.6.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/temp2/jswlibrary_android_rfid/app/libs/bd_unifylicense.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/temp2/jswlibrary_android_rfid/app/libs/fastjson-1.2.68.sec10.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/temp2/jswlibrary_android_rfid/app/libs/kotlin-stdlib-1.4.10.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/temp2/jswlibrary_android_rfid/app/libs/FaceSDK.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/temp2/jswlibrary_android_rfid/app/libs/liantian.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/temp2/jswlibrary_android_rfid/app/libs/okio-2.9.0.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/temp2/jswlibrary_android_rfid/app/libs/okhttp-4.10.0-RC1.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/android_git/jswlibrary_android_rfid_etk/app/libs/gson-2.8.6.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/android_git/jswlibrary_android_rfid_etk/app/libs/bd_unifylicense.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/android_git/jswlibrary_android_rfid_etk/app/libs/fastjson-1.2.68.sec10.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/android_git/jswlibrary_android_rfid_etk/app/libs/kotlin-stdlib-1.4.10.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/android_git/jswlibrary_android_rfid_etk/app/libs/FaceSDK.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/android_git/jswlibrary_android_rfid_etk/app/libs/liantian.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/android_git/jswlibrary_android_rfid_etk/app/libs/okio-2.9.0.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/android_git/jswlibrary_android_rfid_etk/app/libs/okhttp-4.10.0-RC1.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations-java5:15.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/temp2/jswlibrary_android_rfid/app/libs/orbbec_module-debug.aar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/tianlumei/Documents/android_git/jswlibrary_android_rfid_etk/app/libs/orbbec_module-debug.aar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />

app/src/main/java/com/jsw/jswlibrary/BaseActivity.java

@@ -45,7 +45,7 @@ public class BaseActivity extends Activity {
     String sdcardPath = System.getenv("EXTERNAL_STORAGE");
     public static SimpleDateFormat format4 = new SimpleDateFormat("yyyyMMddHHmm");
 
-    public final static double appversion = 0.9d;
+    public final static double appversion = 1.0d;
     public final static String appname = "RFID自助借还机儿童款";
     public static double lastversion = 0d;
     public static String update_path="";//app更新地址

app/src/main/java/com/jsw/jswlibrary/faceregist/register/FaceRegisterNewActivity.java

@@ -168,10 +168,10 @@ public class FaceRegisterNewActivity extends BaseActivity implements View.OnClic
                     //mBtnCollectConfirm.setBackgroundResource(R.drawable.button_selector);
                     List<User> listUsers = FaceApi.getInstance().getUserListByUserName(s.toString().trim());
                     if (listUsers != null && listUsers.size() > 0) {     // 出现用户名重复
-                        mTextError.setVisibility(View.VISIBLE);
+                        /*mTextError.setVisibility(View.VISIBLE);
                         mEditName.setText("");
                         mEditName.requestFocus();
-                        mBtnCollectConfirm.setEnabled(false);
+                        mBtnCollectConfirm.setEnabled(false);*/
                     } else {
                         mTextError.setVisibility(View.INVISIBLE);
                         mBtnCollectConfirm.setEnabled(true);
@@ -210,18 +210,12 @@ public class FaceRegisterNewActivity extends BaseActivity implements View.OnClic
                     mImageInputClear2.setVisibility(View.VISIBLE);
                     String un = mEditName.getText().toString();
                     if(un != null && un.length()>0) {
-                        List<User> listUsers = FaceApi.getInstance().getUserListByUserName(un.trim());
-                        if (listUsers != null && listUsers.size() > 0) {     // 出现用户名重复
-                            mTextError.setVisibility(View.VISIBLE);
-                            mEditName.setText("");
-                            mEditName.requestFocus();
-                            mBtnCollectConfirm.setEnabled(false);
-                        } else {
+
                             mTextError.setVisibility(View.INVISIBLE);
                             mBtnCollectConfirm.setEnabled(true);
                             mBtnCollectConfirm.setTextColor(Color.WHITE);
                             mBtnCollectConfirm.setBackgroundResource(R.drawable.button_selector);
-                        }
+
                     }
                 } else {
                     mImageInputClear2.setVisibility(View.GONE);
@@ -582,6 +576,7 @@ public class FaceRegisterNewActivity extends BaseActivity implements View.OnClic
                     try {
                         if((int)res.get("code") == 200){
                             // 注册到人脸库
+                            FaceApi.getInstance().deleteRecords(userName);
                             boolean isSuccess = FaceApi.getInstance().registerUserIntoDBmanager(null, userName, imageName, null, mFeatures);
                             if (isSuccess) {
                                 // 保存人脸图片