Browse Source

修改部分bug

ChengJH 2 years ago
parent
commit
44d075bf0a

+ 1 - 0
WeiChat/build.gradle

@@ -135,6 +135,7 @@ repositories {
 
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(path: ':facesdk')
     testImplementation deps.junit
     implementation deps.appcompatV7
     implementation deps.supportV4

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

@@ -61,7 +61,6 @@ import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
-import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.broadcast.MsgBroadcast;
@@ -686,7 +685,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         LogUtil.d("OnCreate end:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
 
         //初始化面部识别
-        com.baidu.aip.excep.utils.FaceConfig.initFace(ct);
+        com.baidu.aip.excep.utils.FaceConfig.initFace(activity);
 //        Login();
     }
 

+ 2 - 2
app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -1,7 +1,6 @@
 package com.core.app;
 
 import android.app.Activity;
-import android.app.Application;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.Build;
@@ -54,7 +53,7 @@ import java.io.File;
  * Created by Arison on 2017/8/25.
  */
 public class MyApplication extends BaseApplication {
-
+    public static Context context;
     private static MyApplication INSTANCE = null;
     /*********************
      * 提供全局配置
@@ -102,6 +101,7 @@ public class MyApplication extends BaseApplication {
     @Override
     public void initConfig() throws Exception {
         INSTANCE = this;
+        context=this;
         //后台服务初始化application
         InitializeService.initApplication(this);
 

+ 2 - 0
app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -1,5 +1,6 @@
 package com.core.net.http;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -68,6 +69,7 @@ import java.util.Map;
 
 
 public class ViewUtil {
+    @SuppressLint("StaticFieldLeak")
     public static Context ct;
     public static String erp_phone;
     public static String erp_password;

+ 2 - 2
app_core/common/src/main/java/com/core/service/InitializeService.java

@@ -1,6 +1,6 @@
 package com.core.service;
 
-import android.app.Application;
+import android.annotation.SuppressLint;
 import android.app.IntentService;
 import android.content.Context;
 import android.content.Intent;
@@ -39,7 +39,7 @@ import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
 public class InitializeService extends IntentService {
     private static final String ACTION_INIT_APPLICATION = "initApplication";
-
+    @SuppressLint("StaticFieldLeak")
     private static Context mContext;
 
     public InitializeService() {

+ 2 - 3
app_modular/apputils/src/main/java/com/modular/apputils/utils/SignUtils.java

@@ -39,7 +39,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.core.net.http.ViewUtil.ct;
 import static com.core.utils.CommonUtil.getSharedPreferences;
 
 
@@ -211,11 +210,11 @@ public class SignUtils implements OnHttpResultListener {
                 //当没有获取到MACAddress的时候,判断wifi状态,如果wifi为未启动
                 //mac地址不合法时候   提示开启wifi
                 WifiReceiverUtil wifiReceiver = new WifiReceiverUtil();
-                wifiReceiver.regReceiver(ct, new WifiReceiverUtil.OnWifiStatusChangeLinstener() {
+                wifiReceiver.regReceiver(MyApplication.context, new WifiReceiverUtil.OnWifiStatusChangeLinstener() {
                     @Override
                     public void callBack(boolean isOpen) {
                         if (isOpen) {
-                            macAddress = SystemUtil.getMac(ct);
+                            macAddress = SystemUtil.getMac(MyApplication.context);
                         }
                     }
                 });

+ 2 - 3
app_modular/facesdk/src/main/java/com/baidu/aip/excep/activity/RealTimeDetectFaceActivty.java

@@ -3,7 +3,6 @@ package com.baidu.aip.excep.activity;
 import android.content.Intent;
 import android.os.Looper;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -120,7 +119,7 @@ public class RealTimeDetectFaceActivty extends DetectLoginActivity {
             public void callBack(String accessToken) {
                 LogUtil.i("gong", "accessToken=" + accessToken);
                 httpClient.Api().send(new HttpClient.Builder()
-                        .url("rest/2.0/face/v3/search")
+                        .url("rest/2.0/face/v3/search")//人脸识别接口,详情请去百度AI开放平台
                         .add("access_token", accessToken)
                         .header("Content-Type", "application/json")
                         .add("image", faceBase64)
@@ -247,7 +246,7 @@ public class RealTimeDetectFaceActivty extends DetectLoginActivity {
                 FaceVerify mFaceVerify = new FaceVerify();
                 for (int i = 0; i < user_list.size(); i++) {
                     JSONObject userObject = user_list.getJSONObject(i);
-                    float score = JSONUtil.getFloat(userObject, "score");
+                    float score = JSONUtil.getFloat(userObject, "score");//用户的匹配得分,推荐阈值80分
                     if (mFaceVerify.getScore() < score) {
                         mFaceVerify.setScore(score);
                         mFaceVerify.setUserId(JSONUtil.getText(userObject, "user_id"));