Browse Source

test:测试代码

xwh 4 months ago
parent
commit
5335429965

+ 2 - 1
app/src/main/java/com/hanghui/senic/baiduface/BaiduFaceMainActivity.java

@@ -397,10 +397,11 @@ public class BaiduFaceMainActivity extends BaseActivity {
      * 百度人脸sdk激活授权
      */
     private void initBaiduFaceLicense() {
-
+        Log.i("____456"," initBaiduFaceLicense  1");
         BaiduFaceUtil.initLicense(new BaiduFaceUtil.InitLicenseListener() {
             @Override
             public void initLicenseSuccess() {
+                Log.i("____456"," initBaiduFaceLicense  5");
                 appStatusTextView.setText("人脸算法SDK授权成功");
                 AppHandler.getHandler().postDelayed(new Runnable() {
                     @Override

+ 5 - 5
app/src/main/java/com/hanghui/senic/baiduface/BaiduFacePreviewActivity.java

@@ -205,7 +205,7 @@ public class BaiduFacePreviewActivity extends BaiduFaceMainActivity {
         ThreadPoolManager.getInstance().execute(new Runnable() {
             @Override
             public void run() {
-                FaceSDKManager.getInstance().initUserData(MyAppliction.getContext());
+                FaceSDKManager.getInstance().initDataBases(MyAppliction.getContext()); //初始化人脸数据库
             }
         });
         AppLogUtils.i(true, TAG, "BaiduFaceActivity, onCreate()");
@@ -286,20 +286,20 @@ public class BaiduFacePreviewActivity extends BaiduFaceMainActivity {
         }
         isBaiduFaceSucceed = true;
         initBaiduFaceControllerCallback();
-
+        Log.i("____456"," initBaiduFaceLicense  6");
         initListener(); // 初始化模型
+        Log.i("____456"," initBaiduFaceLicense  7");
         ThreadPoolManager.getInstance().execute(new Runnable() {
             @Override
             public void run() {
                 FaceSDKManager.getInstance().initDataBases(MyAppliction.getContext()); //初始化人脸数据库
             }
         });
-
         FaceSDKManager.getInstance().setActiveLog(false);//百度人脸,关闭日志log, 否则sdk内部会极其高频的输出一大堆 "<line"  开头的log
-
+        Log.i("____456"," initBaiduFaceLicense  8");
         initViews();//初始化预览视图控件
         initFaceCheck();//人脸检测的配置参数
-
+        Log.i("____456"," initBaiduFaceLicense  9");
         stopCameraPreview();//关闭摄像头
         startCameraPreview();//打开摄像头图像预览
 

+ 3 - 3
app/src/main/java/com/hanghui/senic/baiduface/BaiduFaceUtil.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.PixelFormat;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.WindowManager;
 import android.widget.ImageView;
@@ -77,18 +78,17 @@ public class BaiduFaceUtil {
 //        String licenseOnlineKey = "BKJT-X3QX-BXHD-JQFS";//ZP2415000037
         PreferencesUtil.putString("activate_online_key", ConfigManager.getAuthenticationBeanListBean().getLicenseOnlineKey());
 
-
+        Log.i("____456"," initBaiduFaceLicense  2");
         FaceSDKLiscenseManager.getInstance().init(MyAppliction.getContext(), new SdkInitListener() {
             @Override
             public void initStart() {
                 AppLogUtils.i(true, "激活授权", "initLicense(), initStart()");
-
+                Log.i("____456"," initBaiduFaceLicense  3");
             }
 
             @Override
             public void initLicenseSuccess() {
                 AppLogUtils.i(true, "激活授权", "initLicense(), initLicenseSuccess()");
-
                 AppHandler.getHandler().post(new Runnable() {
                     @Override
                     public void run() {

+ 2 - 0
app/src/main/java/com/hanghui/senic/baiduface/FaceSDKLiscenseManager.java

@@ -2,6 +2,7 @@ package com.hanghui.senic.baiduface;
 
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.baidu.idl.main.facesdk.FaceAuth;
 import com.baidu.idl.main.facesdk.callback.Callback;
@@ -76,6 +77,7 @@ public class FaceSDKLiscenseManager {
             faceAuth.initLicenseOnLine(context, licenseOnlineKey, new Callback() {
                 @Override
                 public void onResponse(int code, String response) {
+                    Log.i("____456"," initBaiduFaceLicense  4");
                     if (code == 0) {
                         initStatus = SDK_INIT_SUCCESS;
                         if (listener != null) {

+ 3 - 1
datalibrary/src/main/java/com/example/datalibrary/api/FaceApi.java

@@ -250,7 +250,7 @@ public class FaceApi {
             }
 
             boolean ret = DBManager.getInstance().updateUser(user);
-
+            Log.i("____789","  userUpdate"+ret);
             if (ret) {
                 String userId = user.getUserId();
                 int size = users.size();
@@ -267,7 +267,9 @@ public class FaceApi {
                         curUser.setUserInfo(user.getUserInfo());
                         curUser.setFeature(user.getFeature());
                         curUser.setUserInfo(user.getUserInfo());
+                        Log.i("____789","  userUpdate users"+curUser.toString());
                         users.put(curUser.getUserId(), curUser);
+                        break;
                     }
                 }
             }

+ 11 - 10
datalibrary/src/main/java/com/example/datalibrary/db/DBManager.java

@@ -13,6 +13,7 @@ import android.util.Log;
 import com.example.datalibrary.listener.DBLoadListener;
 import com.example.datalibrary.model.Group;
 import com.example.datalibrary.model.User;
+import com.hanghui.senic.lib_base.BaseApplication;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -60,13 +61,11 @@ public class DBManager {
      * @param context 当前上下文
      */
     public void init(Context context) {
-        synchronized (DBManager.class) {
-            if (context == null) {
-                return;
-            }
-
-            if (mDBHelper == null) {
-                mDBHelper = new DBHelper(context.getApplicationContext());
+        if(mDBHelper==null){
+            synchronized (DBManager.class){
+                if(mDatabase==null){
+                    mDBHelper = new DBHelper(BaseApplication.getContext());
+                }
             }
         }
     }
@@ -286,7 +285,7 @@ public class DBManager {
                 cv.put("user_end_time", user.getEndTime());
 
                 long rowId = mDatabase.insert(DBHelper.TABLE_USER, null, cv);
-                if (rowId < 0) {
+                if (rowId <= 0) {
                     return false;
                 }
 
@@ -767,7 +766,9 @@ public class DBManager {
                 cv.put("user_start_time", user.getStartTime());
                 cv.put("user_end_time", user.getEndTime());
 
-                if (mDatabase.update(DBHelper.TABLE_USER, cv, where, whereValue) < 0) {
+                int count=mDatabase.update(DBHelper.TABLE_USER, cv, where, whereValue);
+                Log.i("____789","  userUpdate DB "+count);
+                if ( count<= 0) {
                     return false;
                 }
             }
@@ -801,7 +802,7 @@ public class DBManager {
             cv.put("update_time", System.currentTimeMillis());
             cv.put("feature", feature);
 
-            if (mDatabase.update(DBHelper.TABLE_USER, cv, where, whereValue) < 0) {
+            if (mDatabase.update(DBHelper.TABLE_USER, cv, where, whereValue) <= 0) {
                 return false;
             }
             setTransactionSuccessful(mDatabase);

+ 1 - 16
datalibrary/src/main/java/com/example/datalibrary/manager/FaceSDKManager.java

@@ -176,27 +176,12 @@ public class FaceSDKManager {
         DBManager.getInstance().init(context);
     }
 
-    public void initUserData(final Context context) {
-        // 初始化数据库
-        DBManager.getInstance().init(context);
-        if (future4 != null && !future4.isDone()) {
-            future4.cancel(true);
-        }
-
-        future4 = es3.submit(new Runnable() {
-            @Override
-            public void run() {
-             FaceApi.getInstance().getAllUserList();
-            }
-        });
-    }
-
     /**
      * 数据库发现变化时候,重新把数据库中的人脸信息添加到内存中,id+feature
      */
     public void initPush(final Context context) {
         if (future3 != null && !future3.isDone()) {
-            future3.cancel(true);
+            return;
         }
 
         future3 = es3.submit(new Runnable() {