From 32f1fab3ce19db6539030c5e574212552a3f3abc Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 31 十月 2025 12:07:57 +0800
Subject: [PATCH] 钥匙柜
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 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 91128eb..2584140 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
@@ -10,6 +10,7 @@
import android.graphics.drawable.BitmapDrawable;
import android.hardware.Camera;
import android.opengl.Visibility;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -210,12 +211,12 @@
getDB().setModel(getVM());
initRGBCheck();
handler.sendEmptyMessageDelayed(0, 1000);
- //鍚姩蹇冭烦
+ /*//鍚姩蹇冭烦
Intent intent = new Intent(MainActivity.this, HeartbeatService.class);
startService(intent);
//鍚姩鏇存柊浜鸿劯
Intent intent2 = new Intent(MainActivity.this, FaceUpdateService.class);
- startService(intent2);
+ startService(intent2);*/
getPermission();
Timber.tag("====>").d(LMobileInfo.getDeviceUniqueId());
}
@@ -229,10 +230,10 @@
long availableMemory = memoryInfo.availMem/(1024*1024);
long usedMemory = totalMemory - availableMemory;
//getDB().tvM.setText("鎬诲唴瀛橈細"+totalMemory+",浣跨敤鍐呭瓨锛�"+usedMemory+",鍙敤鍐呭瓨锛�"+availableMemory);
- if((availableMemory<400&&showTime!=null&&(System.currentTimeMillis()-showTime>5000))||
+ if((availableMemory<100&&showTime!=null&&(System.currentTimeMillis()-showTime>5000))||
("02:00:00".equals(StringUtil.getHM()))){
//鍙敤鍐呭瓨灏忎簬400M,鎴栬�呮瘡澶╁噷鏅�2鐐癸紝閲嶅惎app
- //restartApp();
+ restartApp();
}
}
@@ -316,14 +317,15 @@
getDB().imgLeft.setOnClickListener(new View.OnClickListener() {
@Override
- public void onClick(View v) {
+ public void onClick(View v1) {
//todo 涓存椂浠ｇ爜
if (getDB().nsv.getVisibility()== View.VISIBLE) {
getDB().nsv.setVisibility(View.GONE);
}else {
getDB().nsv.setVisibility(View.VISIBLE);
}
-
+ YNHAPI mAPI = YNHAPI.getInstance();
+ mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.VISIBLE);
}
});
upErrInfo();
@@ -470,6 +472,7 @@
isShowing = true;
YNHAPI mAPI = YNHAPI.getInstance();
mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.ALWAYS_INVISIBLE);
+ mAPI.setBootLaunchApk("com.doumee.keyCabinet", true);
showTime = System.currentTimeMillis();
if(!isFaceOk) {
initLicense();
@@ -1174,6 +1177,8 @@
//瀹氭椂鎷夊彇鍩烘湰淇℃伅
getVM().devLogin();
getPermission();
+ getVM().devHeart();
+ EventBus.getDefault().post(new GetFacesEvent());
}else {
loopDownCount--;
}
@@ -1375,7 +1380,7 @@
EventBus.getDefault().post(new CloseGridOneResultEvent(key,"00".equals(open)?1:0));
if(isShowing&&isShowTip){
//淇敼鏄剧ず鎻愰啋
- doRegister(5,null);
+ getVM().doAction(5);
}
}else if(data.startsWith("80")){
//鏌ヨ鎵�鏈夐棬鐘舵��
@@ -1470,7 +1475,7 @@
keyPreviousData = data;
}else if(data.startsWith("CC02")){
runOnUiThread(() -> {
- //getVM().addInfo("鑾峰彇鍒伴挜鍖欐暟鎹�:" + data);
+ getVM().addInfo("鑾峰彇鍒伴挜鍖欐暟鎹�:" + data);
jxKey(data);
});
keyPreviousData = null;
@@ -1478,7 +1483,7 @@
if(!TextUtils.isEmpty(keyPreviousData)){
String data2 = keyPreviousData+data;
runOnUiThread(() -> {
- //getVM().addInfo("鑾峰彇鍒伴挜鍖欐暟鎹�:" + data2);
+ getVM().addInfo("鑾峰彇鍒伴挜鍖欐暟鎹�:" + data2);
if(data2.contains("CC01")&&data2.contains("CC02")){
String[] sp = data2.split("CC02");
if(sp.length==2){
@@ -1538,12 +1543,6 @@
updateList.add(gridDo);
}
}
- }
- //todo 鍘绘帀
- CabinetGridDo gridDo = oldMap.get("0101");
- if(gridDo!=null) {
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+
- "=================>鏇存柊鏁版嵁褰撳墠閽ュ寵7锛�" + gridDo.getCurKeyCode()));
}
getVM().updateGrids(updateList);
@@ -1748,15 +1747,15 @@
private boolean isInitPort;
//鍒濆鍖栦覆鍙�
private void initPort(){
- SpUtil.setString("port_grid","/dev/ttyS7");
- SpUtil.setString("port_key","/dev/ttyS1");
- SpUtil.setString("port_jiu","/dev/ttyS2");
+ //SpUtil.setString("port_grid","/dev/ttyS7");
+ //SpUtil.setString("port_key","/dev/ttyS1");
+ //SpUtil.setString("port_jiu","/dev/ttyS2");
gridPath = SpUtil.getString("port_grid");
- //getVM().addInfo("闂ㄤ覆鍙ｉ摼鎺ワ細"+gridPath);
+ getVM().addInfo("闂ㄤ覆鍙ｉ摼鎺ワ細"+gridPath);
keyPath = SpUtil.getString("port_key");
- //getVM().addInfo("閽ュ寵涓插彛閾炬帴锛�"+keyPath);
+ getVM().addInfo("閽ュ寵涓插彛閾炬帴锛�"+keyPath);
jiuPath = SpUtil.getString("port_jiu");
- //getVM().addInfo("閰掔簿涓插彛閾炬帴锛�"+jiuPath);
+ getVM().addInfo("閰掔簿涓插彛閾炬帴锛�"+jiuPath);
if(!TextUtils.isEmpty(SpUtil.getString("port_grid"))&&
!TextUtils.isEmpty(SpUtil.getString("port_key"))&&
!TextUtils.isEmpty(SpUtil.getString("port_jiu"))){
--
Gitblit v1.9.3