From 2e9e14088a9a7ec0eabb99eed54efeb1254fa927 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 17 十月 2025 14:15:29 +0800
Subject: [PATCH] 钥匙柜

---
 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/AddFaceActivity.java |   50 +++++++++++++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/AddFaceActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/AddFaceActivity.java
index f8c6910..0c5ee94 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/AddFaceActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/AddFaceActivity.java
@@ -129,7 +129,7 @@
                 mFaceUserAdapter.notifyDataSetChanged();
             }
         });
-        getVM().getDatas("");
+        getVM().getDatas();
     }
 
     @Override
@@ -167,17 +167,17 @@
         // 浣跨敤 Glide 鍔犺浇鍥剧墖骞惰浆鎹负 Bitmap
         Glide.with(this)
                 .asBitmap()
-                .load(bean.getFaceUrl())
+                .load(bean.getFaceImg())
                 .addListener(new RequestListener<Bitmap>() {
                     @Override
                     public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
                         //鍔犺浇澶辫触
-                        Timber.d("====>鍥剧墖涓嬭浇澶辫触%s",bean.getName());
+                        Timber.d("====>鍥剧墖涓嬭浇澶辫触%s",bean.getMemberName());
                         failCount++;
                         if(failStr.length()>0){
                             failStr.append(",");
                         }
-                        failStr.append(bean.getName());
+                        failStr.append(bean.getMemberName());
                         finishCount++;
                         loadListener.onLoad(finishCount, mSelectCount, finishCount * 1.0f / mSelectCount);
                         if (finishCount == mSelectCount) {
@@ -203,35 +203,35 @@
                                 //鏈変汉鑴�
                                 // 鍒ゆ柇璐ㄩ噺妫�娴嬶紝閽堝妯$硦搴︺�侀伄鎸°�佽搴�
                                 if (ret == 128) {
-                                    Timber.d("====>鍥剧墖鐗瑰緛鎶藉彇鎴愬姛: %s", bean.getName());
+                                    Timber.d("====>鍥剧墖鐗瑰緛鎶藉彇鎴愬姛: %s", bean.getMemberName());
                                     //鎻掑叆鏁版嵁搴�
-                                    User user = FaceApi.getInstance().getByUserId(bean.getType(), bean.getId());
+                                    User user = FaceApi.getInstance().getByUserId(bean.getGroupId(), bean.getMemberId());
                                     boolean isSave = false;
                                     if (user == null) {
                                         //鏂板
-                                        isSave = FaceApi.getInstance().registerUserIntoDBmanager(bean.getType(),
-                                                bean.getId(), bean.getName(), bean.getFaceUrl(), JSON.toJSONString(bean), secondFeature);
+                                        isSave = FaceApi.getInstance().registerUserIntoDBmanager(bean.getGroupId(),
+                                                bean.getMemberId(), bean.getMemberName(), bean.getFaceImg(), JSON.toJSONString(bean), secondFeature);
                                     } else {
                                         //鏇存柊
-                                        user.setUserName(bean.getName());
-                                        user.setImageName(bean.getFaceUrl());
+                                        user.setUserName(bean.getMemberName());
+                                        user.setImageName(bean.getFaceImg());
                                         user.setFeature(secondFeature);
                                         isSave = FaceApi.getInstance().userUpdateOnly(user);
                                     }
 
                                     if (isSave) {
                                         //淇濆瓨鎴愬姛
-                                        Timber.d("====>褰曞叆鎴愬姛%s",bean.getName());
+                                        Timber.d("====>褰曞叆鎴愬姛%s",bean.getMemberName());
                                         fail = false;
                                     } else {
-                                        Timber.d("====>褰曞叆澶辫触%s",bean.getName());
+                                        Timber.d("====>褰曞叆澶辫触%s",bean.getMemberName());
                                     }
                                 } else {
-                                    Timber.d("====>鍥剧墖鐗瑰緛鎶藉彇澶辫触%s",bean.getName());
+                                    Timber.d("====>鍥剧墖鐗瑰緛鎶藉彇澶辫触%s",bean.getMemberName());
                                 }
                             } else {
                                 // 涓婁紶鍥剧墖鏃犱汉鑴搁殣钘�
-                                Timber.d("====>鍥剧墖鐗瑰緛鎶藉彇澶辫触%s",bean.getName());
+                                Timber.d("====>鍥剧墖鐗瑰緛鎶藉彇澶辫触%s",bean.getMemberName());
                             }
 
                         }
@@ -240,7 +240,7 @@
                             if(failStr.length()>0){
                                 failStr.append(",");
                             }
-                            failStr.append(bean.getName());
+                            failStr.append(bean.getMemberName());
                         }else {
                             bean.setChecked(false);
                         }
@@ -284,17 +284,17 @@
                                 //鏈変汉鑴�
                                 // 鍒ゆ柇璐ㄩ噺妫�娴嬶紝閽堝妯$硦搴︺�侀伄鎸°�佽搴�
                                 if (ret == 128) {
-                                    Timber.d("====>鍥剧墖鐗瑰緛鎶藉彇鎴愬姛: %s", bean.getName());
+                                    Timber.d("====>鍥剧墖鐗瑰緛鎶藉彇鎴愬姛: %s", bean.getMemberName());
                                     //鎻掑叆鏁版嵁搴�
                                     User user = FaceApi.getInstance().getByUserId(bean.getType(), bean.getId());
                                     boolean isSave = false;
                                     if (user == null) {
                                         //鏂板
                                         isSave = FaceApi.getInstance().registerUserIntoDBmanager(bean.getType(),
-                                                bean.getId(), bean.getName(), bean.getFaceUrl(), JSON.toJSONString(bean), secondFeature);
+                                                bean.getId(), bean.getMemberName(), bean.getFaceUrl(), JSON.toJSONString(bean), secondFeature);
                                     } else {
                                         //鏇存柊
-                                        user.setUserName(bean.getName());
+                                        user.setUserName(bean.getMemberName());
                                         user.setImageName(bean.getFaceUrl());
                                         user.setFeature(secondFeature);
                                         isSave = FaceApi.getInstance().userUpdateOnly(user);
@@ -302,20 +302,20 @@
 
                                     if (isSave) {
                                         //淇濆瓨鎴愬姛
-                                        Timber.d("====>褰曞叆鎴愬姛%s",bean.getName());
+                                        Timber.d("====>褰曞叆鎴愬姛%s",bean.getMemberName());
                                         fail = false;
                                     } else {
-                                        Timber.d("====>褰曞叆澶辫触%s",bean.getName());
+                                        Timber.d("====>褰曞叆澶辫触%s",bean.getMemberName());
                                     }
                                 } else {
-                                    Timber.d("====>鍥剧墖鐗瑰緛鎶藉彇澶辫触%s",bean.getName());
+                                    Timber.d("====>鍥剧墖鐗瑰緛鎶藉彇澶辫触%s",bean.getMemberName());
                                 }
                             } else {
                                 // 涓婁紶鍥剧墖鏃犱汉鑴搁殣钘�
-                                Timber.d("====>鍥剧墖鐗瑰緛鎶藉彇澶辫触%s",bean.getName());
+                                Timber.d("====>鍥剧墖鐗瑰緛鎶藉彇澶辫触%s",bean.getMemberName());
                             }
                         } else {
-                            Timber.d("====>鍥剧墖涓嬭浇澶辫触%s",bean.getName());
+                            Timber.d("====>鍥剧墖涓嬭浇澶辫触%s",bean.getMemberName());
                         }
                         bean.setChecked(false);
                         if(fail){
@@ -323,7 +323,7 @@
                             if(failStr.length()>0){
                                 failStr.append(",");
                             }
-                            failStr.append(bean.getName());
+                            failStr.append(bean.getMemberName());
                         }
                         finishCount++;
                         loadListener.onLoad(finishCount, mSelectCount, finishCount * 1.0f / mSelectCount);
@@ -413,7 +413,7 @@
                     }else {
                         List<FaceUserBean> beans = new ArrayList<>();
                         for(FaceUserBean d:mUserInfoList){
-                            if(s.toString().trim().contains(d.getName())){
+                            if(s.toString().trim().contains(d.getMemberName())){
                                 beans.add(d);
                             }
                         }

--
Gitblit v1.9.3