From ba92b976c7fb9f8bbe4a1bf9d06fa8468d26be58 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期一, 15 十二月 2025 18:01:13 +0800
Subject: [PATCH] 指纹钥匙柜人脸报错
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java | 81 +++++++++++++++++++++++-----------------
1 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
index 52a2407..21deb0a 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
@@ -14,11 +14,11 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.serialport.SerialPortFinder;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.TextAppearanceSpan;
+import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -75,6 +75,7 @@
import com.doumee.keyCabinet.ui.keyCabinet.ChangeUrlActivity;
import com.doumee.keyCabinet.ui.keyCabinet.KeyCabinetActivity;
import com.doumee.keyCabinet.ui.keyCabinet.ManageLoginActivity;
+import com.doumee.keyCabinet.ui.keyCabinet.ZWListActivity;
import com.doumee.keyCabinet.ui.service.FaceUpdateService;
import com.doumee.keyCabinet.ui.service.HeartbeatService;
import com.doumee.keyCabinet.ui.face.AddFaceActivity;
@@ -117,22 +118,24 @@
import com.example.datalibrary.model.User;
import com.example.datalibrary.utils.ToastUtils;
import com.example.datalibrary.view.PreviewTexture;
-import com.mc.enjoysdk.McHome;
-import com.mc.enjoysdk.McSystemUi;
-import com.mc.enjoysdk.transform.McSystemUiFlag;
+import com.proembed.service.MyService;
import com.yanzhenjie.permission.runtime.Permission;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
+import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.regex.Matcher;
@@ -166,8 +169,7 @@
private int downCount = 0;
private Long lastDownTime;
private Long showTime;
- private McSystemUi mcSystemUi;
- private McHome mcHome;
+ private MyService mXService;
private Handler handler = new Handler(){
@Override
@@ -226,9 +228,8 @@
Intent intent2 = new Intent(MainActivity.this, FaceUpdateService.class);
startService(intent2);*/
getPermission();
- Timber.tag("====>").d(LMobileInfo.getDeviceUniqueId());
- mcSystemUi = McSystemUi.getInstance(this);
- mcHome = McHome.getInstance(this);
+ mXService = new MyService(this);
+ //Timber.tag("====>").d(LMobileInfo.getDeviceUniqueId());
}
private void initM(){
@@ -243,6 +244,7 @@
if((availableMemory<100&&showTime!=null&&(System.currentTimeMillis()-showTime>5000))||
("02:00:00".equals(StringUtil.getHM()))){
//鍙敤鍐呭瓨灏忎簬400M,鎴栬�呮瘡澶╁噷鏅�2鐐癸紝閲嶅惎app
+ //ToastView.show(MApplication.mContext,"鍐呭瓨绱у紶锛岄噸鏂板惎鍔�");
restartApp();
}
}
@@ -298,7 +300,6 @@
}
lastDownTime1 = System.currentTimeMillis();
downCount1++;
- System.out.println();
//Timber.tag("==>").d(""+downCount1);
if(downCount1>4) {
downCount1=0;
@@ -325,7 +326,6 @@
}
}
});
-
getDB().imgLeft.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v1) {
@@ -336,9 +336,7 @@
getDB().nsv.setVisibility(View.VISIBLE);
}
//鏄剧ず鐘舵�佹爮
- mcSystemUi.temporarilySwitchStatusBar(true);
- //鏄剧ず瀵艰埅鏍�
- mcSystemUi.temporarilySwitchNavigation(true);
+ MCUtils.show(mXService);
}
});
upErrInfo();
@@ -350,6 +348,9 @@
if(devConfigBean!=null){
if(devConfigBean.getBannerList()!=null) {
setBanner(devConfigBean.getBannerList());
+ }
+ if(!isFaceOk) {
+ initLicense();
}
setJiuConfig();
initPort();
@@ -411,6 +412,10 @@
switch (type){
case 2:
case 3: {
+ if(!isFaceOk) {
+ initLicense();
+ return;
+ }
//鏍￠獙鏄惁鐧诲綍
if(MApplication.getConfigBean().getId()==null){
Toast.makeText(mContext, "璁惧鏈坊鍔狅紝鏃犳硶鎿嶄綔", Toast.LENGTH_SHORT).show();
@@ -491,12 +496,9 @@
super.onResume();
isShowing = true;
getVM().setSubmit(true);
- MCUtils.hind(mcSystemUi);
- mcHome.setHomePackage("com.doumee.keyCabinet");
+ MCUtils.hind(mXService);
+ MCUtils.setHomePackage(mXService,"com.doumee.keyCabinet");
showTime = System.currentTimeMillis();
- if(!isFaceOk) {
- initLicense();
- }
if(isHavePermission) {
checkUpdate();
}
@@ -566,7 +568,6 @@
@Subscribe
public void GetFacesEvent(GetFacesEvent event){
- getVM().addInfo("鏌ヨ浜鸿劯鏁版嵁======銆�");
if(!isFinishing()&&!isUpdatingFace){
getVM().addInfo("鏌ヨ浜鸿劯鏁版嵁======銆媔sDBLoad = "+isDBLoad);
if(isDBLoad){
@@ -712,11 +713,14 @@
}
private void initModel(List<FaceUserBean> userBeans) {
+ if(!isFaceOk){
+ return;
+ }
if (com.example.datalibrary.manager.FaceSDKManager.initStatus == com.example.datalibrary.manager.FaceSDKManager.SDK_MODEL_LOAD_SUCCESS) {
- getVM().addInfo("鏇存柊浜鸿劯===銆嬪紑濮嬫洿鏂�");
+ //getVM().addInfo("鏇存柊浜鸿劯===銆嬪紑濮嬫洿鏂�");
waitUpdate(userBeans);
}else {
- getVM().addInfo("鏇存柊浜鸿劯===銆嬪垵濮嬪寲");
+ //getVM().addInfo("鏇存柊浜鸿劯===銆嬪垵濮嬪寲");
initFaceSDKManager(userBeans);
}
}
@@ -1348,7 +1352,7 @@
@Override
public void onResultBytes(byte[] bytes) {
- if(isFinishing()){
+ if(isFinishing()||getVM()==null){
return;
}
if(bytes.length==0){
@@ -1363,7 +1367,7 @@
@Subscribe(threadMode = ThreadMode.MAIN)
public void HttpEvent(HttpEvent e){
- if(!isFinishing()){
+ if(!isFinishing()&&getVM()!=null){
getVM().addInfo(e.getMsg());
}
}
@@ -1590,7 +1594,17 @@
//涓�鍙风増
bh = 1;
}
- String[] sp = data.split("AA");
+ List<String> sp = new ArrayList<>();
+ String data2 = data.substring(8,data.length());
+ while (data2.length()>0){
+ if (data2.length()<22) {
+ sp.add(data2+"");
+ data2 = "";
+ }else {
+ sp.add(data2.substring(0,22));
+ data2 = data2.substring(22);
+ }
+ }
for(String s:sp){
if(s.length()>=20){
String key = SportUtils.intToHex(bh)+s.substring(4,6);
@@ -1604,7 +1618,7 @@
}else {
gridDo.setCurKeyCode("");
}
- if("0101".equals(key)) {
+ if("0109".equals(key)) {
getVM().addInfo(key+" , "+isHaveKey+" "+keyCode);
getVM().addInfo(key + "璁剧疆閽ュ寵锛�" + gridDo.getCurKeyCode());
}
@@ -1631,7 +1645,7 @@
@Override
public void onResultBytes(byte[] bytes) {
- if(isFinishing()){
+ if(isFinishing()||getVM()==null){
return;
}
if(bytes.length==0){
@@ -1828,19 +1842,18 @@
/*SpUtil.setString("port_grid","/dev/ttyS0");
SpUtil.setString("port_key","/dev/ttyS4");
SpUtil.setString("port_jiu","/dev/ttyS9");*/
-
- gridPath = SpUtil.getString("port_grid");
- getVM().addInfo("闂ㄤ覆鍙ｉ摼鎺ワ細"+gridPath);
- keyPath = SpUtil.getString("port_key");
- getVM().addInfo("閽ュ寵涓插彛閾炬帴锛�"+keyPath);
- jiuPath = SpUtil.getString("port_jiu");
- getVM().addInfo("閰掔簿涓插彛閾炬帴锛�"+jiuPath);
if(!TextUtils.isEmpty(SpUtil.getString("port_grid"))&&
!TextUtils.isEmpty(SpUtil.getString("port_key"))&&
!TextUtils.isEmpty(SpUtil.getString("port_jiu"))){
if(isInitPort){
return;
}
+ gridPath = SpUtil.getString("port_grid");
+ getVM().addInfo("闂ㄤ覆鍙ｉ摼鎺ワ細"+gridPath);
+ keyPath = SpUtil.getString("port_key");
+ getVM().addInfo("閽ュ寵涓插彛閾炬帴锛�"+keyPath);
+ jiuPath = SpUtil.getString("port_jiu");
+ getVM().addInfo("閰掔簿涓插彛閾炬帴锛�"+jiuPath);
xhCount=0;
closePort(chosePort);
if(!TextUtils.isEmpty(SpUtil.getString("port_grid"))){
--
Gitblit v1.9.3