From fad0704afaf4ed07963d267142cc6f625a09909d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 六月 2026 18:32:05 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 6562451..d64ece9 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
@@ -339,6 +339,9 @@
if(devConfigBean.getBannerList()!=null) {
setBanner(devConfigBean.getBannerList());
}
+ if(!isFaceOk) {
+ initLicense();
+ }
setJiuConfig();
initPort();
}
@@ -398,6 +401,10 @@
switch (type){
case 2:
case 3: {
+ if(!isFaceOk) {
+ initLicense();
+ return;
+ }
//鏍￠獙鏄惁鐧诲綍
if(MApplication.getConfigBean().getId()==null){
Toast.makeText(mContext, "璁惧鏈坊鍔狅紝鏃犳硶鎿嶄綔", Toast.LENGTH_SHORT).show();
@@ -482,9 +489,6 @@
mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.ALWAYS_INVISIBLE);
mAPI.setBootLaunchApk("com.doumee.keyCabinet", true);
showTime = System.currentTimeMillis();
- if(!isFaceOk) {
- initLicense();
- }
if(isHavePermission) {
checkUpdate();
}
@@ -1294,9 +1298,6 @@
if(bytes.length==0){
return;
}
- runOnUiThread(() -> {
- getVM().addInfo("鑾峰彇鍒伴棬鏁版嵁:"+StringUtil.DateToStrSS(new Date())+"==>"+ SportUtils.bytesToHexSimple(bytes));
- });
EventBus.getDefault().post(new CLGridEvent(SportUtils.bytesToHexSimple(bytes)));
}
};
@@ -1314,6 +1315,7 @@
String data = e.getData();
data = data.toUpperCase();
data = data.replaceAll("\\s+", "");
+ String finalData = data;
if(data.startsWith("8A")){
//寮�閿佸弽棣�
String bh = data.substring(2,4);
@@ -1374,6 +1376,9 @@
}
}
}else if(data.startsWith("81")){
+ runOnUiThread(() -> {
+ getVM().addInfo(">>>>>>>>>>>>>>>鑾峰彇鍒板叧闂ㄦ暟鎹�:"+StringUtil.DateToStrSS(new Date())+"==>"+ finalData);
+ });
//涓诲姩鍏抽棬 81 01 01 11 90
String bh = data.substring(2,4);
String tdh = data.substring(4,6);
@@ -1394,6 +1399,9 @@
}
}else if(data.startsWith("80")){
//鏌ヨ鎵�鏈夐棬鐘舵��
+ runOnUiThread(() -> {
+ getVM().addInfo("<<<<<<<<<<<<<<<<<<<<鑾峰彇鍒版墍鏈夐棬鐘舵�佹暟鎹�:"+StringUtil.DateToStrSS(new Date())+"==>"+ finalData);
+ });
//80 01 00 00 FF FF 33 B2
//80 02 00 00 00 F7 33 46
if(data.length()>=14){
@@ -1767,9 +1775,9 @@
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);
keyPath = SpUtil.getString("port_key");
--
Gitblit v1.9.3