Ver Fonte

Merge branch 'feature_bitliker' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

Bitliker há 7 anos atrás
pai
commit
241d215cbb

+ 1 - 1
WeiChat/build.gradle

@@ -184,7 +184,7 @@ dependencies {
     compile project(':appbooking')
     compile project(':appmusic')
     compile project(':apputils')
-//    compile project(':faceplatform-ui')
+    compile project(':faceplatform-ui')
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.android.support:support-v4:26.+'
 }

+ 2 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -43,6 +43,7 @@ import com.baidu.android.pushservice.PushConstants;
 import com.baidu.android.pushservice.PushManager;
 import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
+import com.baidu.idl.face.platform.ui.config.FaceConfig;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
@@ -633,7 +634,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         LogUtil.d("OnCreate end:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
 
         //初始化面部识别
-//        FaceConfig.initFace(ct);
+        FaceConfig.initFace(ct);
 
     }
 

+ 3 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -19,6 +19,7 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 
+import com.baidu.idl.face.platform.ui.activity.FaceVeriftyActivity;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -330,8 +331,8 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
                 break;
 
             case R.id.itemSignImage:
-                sign(true);
-//                startActivityForResult(new Intent(ct, FaceVeriftyActivity.class), 0x223);
+//                sign(true);
+                startActivityForResult(new Intent(ct, FaceVeriftyActivity.class), 0x223);
                 break;
         }
 

+ 1 - 2
app_modular/appcontact/build.gradle

@@ -22,6 +22,5 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile deps.junit
     compile deps.appcompatV7
-    compile project(':common')
-    compile project(':network')
+    compile project(path: ':apputils')
 }

+ 1 - 1
app_modular/appcontact/src/main/java/com/uas/appcontact/ui/fragment/ContactsFragment.java

@@ -41,10 +41,10 @@ import com.core.utils.sortlist.SideBar;
 import com.core.widget.CustomProgressDialog;
 import com.core.widget.VoiceSearchView;
 import com.core.widget.listener.EditChangeListener;
+import com.modular.apputils.manager.ContactsManager;
 import com.uas.appcontact.R;
 import com.uas.appcontact.adapter.FriendSortAdapter;
 import com.uas.appcontact.listener.ImStatusListener;
-import com.uas.appcontact.manager.ContactsManager;
 import com.uas.appcontact.ui.activity.CommonFragmentActivity;
 import com.uas.appcontact.ui.activity.CompanyContactsActivity;
 import com.uas.appcontact.ui.activity.ContactsActivity;

+ 1 - 9
app_modular/appcontact/src/main/java/com/uas/appcontact/manager/ContactsManager.java → app_modular/apputils/src/main/java/com/modular/apputils/manager/ContactsManager.java

@@ -1,35 +1,27 @@
-package com.uas.appcontact.manager;
+package com.modular.apputils.manager;
 
 
-import android.os.Bundle;
 import android.os.Looper;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.common.LogUtil;
 import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.common.data.TextUtil;
 import com.common.thread.ThreadUtil;
-import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiModel;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
-import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.dao.DBManager;
 import com.core.model.EmployeesEntity;
 import com.core.model.Friend;
 import com.core.model.HrorgsEntity;
 import com.core.net.http.http.OAHttpHelper;
-import com.core.net.http.http.OnHttpResultListener;
-import com.core.net.http.http.Request;
 import com.core.utils.CommonUtil;
-import com.core.utils.ToastUtil;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;

+ 112 - 0
app_modular/faceplatform-ui/src/main/java/com/baidu/idl/face/platform/ui/activity/FaceListActivity.java

@@ -0,0 +1,112 @@
+package com.baidu.idl.face.platform.ui.activity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baidu.idl.face.platform.ui.config.FaceConfig;
+import com.common.LogUtil;
+import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
+import com.common.data.StringUtil;
+import com.core.model.EmployeesEntity;
+import com.core.utils.CommonUtil;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.Result2Listener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.modular.apputils.activity.BaseNetActivity;
+import com.modular.apputils.manager.ContactsManager;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 当前账套保存的人脸列表
+ */
+public class FaceListActivity extends BaseNetActivity implements ContactsManager.OnEmployListener {
+    private Map<String, Integer> faceIdList;
+
+
+    @Override
+    protected String getBaseUrl() {
+        return "https://aip.baidubce.com/";
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return 0;
+    }
+
+    @Override
+    protected void init() throws Exception {
+        initData();
+    }
+
+
+    private void initData() {
+        loadFaceList();
+    }
+
+    private void loadFaceList() {
+        showProgress();
+        FaceConfig.loadToken(new FaceConfig.FaceTokenListener() {
+            @Override
+            public void callBack(String accessToken) {
+                LogUtil.i("gong", "accessToken=" + accessToken);
+                httpClient.Api().send(new HttpClient.Builder()
+                        .url("rest/2.0/face/v3/faceset/group/getusers")
+                        .add("access_token", accessToken)
+                        .header("Content-Type", "application/json")
+                        .add("length", 1000)
+                        .add("group_id", CommonUtil.getEnuu(ct))
+                        .isDebug(true)
+                        .method(Method.GET).build(), new ResultSubscriber<>(new Result2Listener<Object>() {
+                    @Override
+                    public void onResponse(Object o) {
+                        try {
+                            JSONObject jsonObject = JSON.parseObject(o.toString());
+                            JSONObject result = JSONUtil.getJSONObject(jsonObject, "result");
+                            if (JSONUtil.getText(jsonObject,"error_msg").equals("SUCCESS") || !result.isEmpty()) {
+                                JSONArray user_id_list = JSONUtil.getJSONArray(result, "user_id_list");
+                                if (!ListUtils.isEmpty(user_id_list)) {
+                                    if (faceIdList == null) {
+                                        faceIdList = new HashMap<>();
+                                    } else {
+                                        faceIdList.clear();
+                                    }
+                                    for (int i = 0; i < user_id_list.size(); i++) {
+                                        if (!StringUtil.isEmpty(user_id_list.getString(i))) {
+                                            faceIdList.put(user_id_list.getString(i), 1);
+                                        }
+                                    }
+                                }
+                            }
+                        } catch (Exception e) {
+                        }
+                        ContactsManager.getInstance().loadContact(FaceListActivity.this);
+                        dismissProgress();
+                    }
+
+                    @Override
+                    public void onFailure(Object t) {
+                        dismissProgress();
+                        LogUtil.i("gong", "verify onFailure=" + t.toString());
+                    }
+                }));
+            }
+        });
+    }
+
+    @Override
+    public void callback(List<EmployeesEntity> employees) {
+        Iterator<EmployeesEntity> iterator = employees.iterator();
+        while (iterator.hasNext()) {
+            EmployeesEntity e = iterator.next();
+            if (!faceIdList.containsKey(e.getEm_IMID())) {
+                iterator.remove();
+            }
+        }
+    }
+}

+ 10 - 6
app_modular/faceplatform-ui/src/main/java/com/baidu/idl/face/platform/ui/activity/FaceVeriftyActivity.java

@@ -45,11 +45,16 @@ public class FaceVeriftyActivity extends FaceDetectActivity {
                     @Override
                     public void result(boolean clickSure) {
                         if (clickSure) {
+                            //公司名_帐套名_电话_姓名
                             String userInfo = "";
+                            String commpany = CommonUtil.getSharedPreferences(ct, "erp_commpany");
+                            String master = CommonUtil.getMaster();
+                            String name = CommonUtil.getName();
+                            String phone = null;
                             if (MyApplication.getInstance().mLoginUser != null) {
-                                userInfo = MyApplication.getInstance().mLoginUser.getTelephone() + "_";
+                                phone = MyApplication.getInstance().mLoginUser.getTelephone();
                             }
-                            userInfo += CommonUtil.getName();
+                            userInfo = commpany + "_" + master + "_" + phone + "_" + name;
                             register(faceBase64, group_id_list, user_id, userInfo);
                         } else {
                             setResult(0);
@@ -128,7 +133,7 @@ public class FaceVeriftyActivity extends FaceDetectActivity {
                         .header("Content-Type", "application/json")
                         .add("image", faceBase64)
                         .add("image_type", "BASE64")
-                        .add("liveness_control", "HIGH")
+                        .add("liveness_control", "NORMAL")
                         .add("user_id", imid)
                         .isDebug(true)
                         .add("group_id_list", emUU)
@@ -191,8 +196,8 @@ public class FaceVeriftyActivity extends FaceDetectActivity {
                         .header("Content-Type", "application/json")
                         .add("image", faceBase64)
                         .add("image_type", "BASE64")
-                        .add("quality_control", "HIGH")
-                        .add("liveness_control", "HIGH")
+                        .add("quality_control", "NORMAL")
+                        .add("liveness_control", "NORMAL")
                         .add("user_id", user_id)
                         .add("user_info", user_info)
                         .isDebug(true)
@@ -227,5 +232,4 @@ public class FaceVeriftyActivity extends FaceDetectActivity {
         });
     }
 
-
 }