From 81e258e6aa59dafce998b4f41b1271a9f5c9aff5 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期四, 30 十月 2025 20:07:26 +0800
Subject: [PATCH] 钥匙柜
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java | 361 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 255 insertions(+), 106 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 13b914e..91128eb 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
@@ -6,6 +6,7 @@
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
+import android.graphics.PixelFormat;
import android.graphics.drawable.BitmapDrawable;
import android.hardware.Camera;
import android.opengl.Visibility;
@@ -20,6 +21,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.view.WindowManager;
import android.widget.PopupWindow;
import android.widget.RelativeLayout;
import android.widget.TextView;
@@ -60,6 +62,7 @@
import com.doumee.keyCabinet.event.KeyResultEvent;
import com.doumee.keyCabinet.event.ManageOpenGridResultEvent;
import com.doumee.keyCabinet.event.OpenAllGridEvent;
+import com.doumee.keyCabinet.event.OpenErrEvent;
import com.doumee.keyCabinet.event.OpenGridEvent;
import com.doumee.keyCabinet.event.OpenGridListEvent;
import com.doumee.keyCabinet.event.OpenGridOneResultEvent;
@@ -109,6 +112,7 @@
import com.example.datalibrary.model.User;
import com.example.datalibrary.utils.ToastUtils;
import com.example.datalibrary.view.PreviewTexture;
+import com.innohi.YNHAPI;
import com.yanzhenjie.permission.runtime.Permission;
import org.greenrobot.eventbus.EventBus;
@@ -171,8 +175,21 @@
getVM().getFaceLD();
}
getVM().upBraceletLog();*/
+ case 1:
+ if(isShowing) {
+ EventBus.getDefault().post(new OpenGridEvent((String) msg.obj));
+ handler.sendEmptyMessageDelayed(1, 1000);
+ }
+ break;
case 2:
-
+ if(isShowing){
+ //閲嶆柊鍙戦�侀挜鍖欐煡璇�
+ //鍙戦�佹煡璇㈤挜鍖欏彿
+ EventBus.getDefault().post(new GetKeyStatusEvent());
+ handler.sendEmptyMessageDelayed(2,1200);
+ }
+ break;
+ default:
break;
}
}
@@ -270,7 +287,7 @@
lastDownTime1 = System.currentTimeMillis();
downCount1++;
System.out.println();
- Timber.tag("==>").d(""+downCount1);
+ //Timber.tag("==>").d(""+downCount1);
if(downCount1>4) {
downCount1=0;
lastDownTime1=null;
@@ -296,14 +313,7 @@
}
}
});
- getDB().tvVersion.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- //todo 涓存椂浠ｇ爜
- //setJiuConfig();
- SpUtil.saveString("rbgCameraId","0");
- }
- });
+
getDB().imgLeft.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -458,6 +468,8 @@
protected void onResume() {
super.onResume();
isShowing = true;
+ YNHAPI mAPI = YNHAPI.getInstance();
+ mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.ALWAYS_INVISIBLE);
showTime = System.currentTimeMillis();
if(!isFaceOk) {
initLicense();
@@ -773,7 +785,63 @@
waitBeans.clear();
selectBeans.addAll(userBeans);
finishCount=0;
- faceHandler.sendEmptyMessage(0);
+ /*//鍒犻櫎鍏ㄩ儴
+ FaceApi.getInstance().userClean();
+ faceHandler.sendEmptyMessage(0);*/
+
+ HashMap<String,String> uMap = new HashMap<>();
+ for(FaceUserBean d:selectBeans){
+ String key = d.getMemberId().toString()+"_"+d.getGroupId();
+ uMap.put(key,"");
+ }
+ //鍒犻櫎涓嶅瓨鍦ㄧ敤鎴�
+ List<User> users = FaceApi.getInstance().getAllUserList();
+ List<User> dels = new ArrayList<>();
+ for(User u:users){
+ String key = u.getUserId()+"_"+u.getGroupId();
+ if(!uMap.containsKey(key)){
+ dels.add(u);
+ }
+ }
+ if(dels.size()>0){
+ UserInfoManager.getInstance().deleteUserListInfo(dels,
+ "", new UserInfoManager.UserInfoListener() {
+ @Override
+ public void userListDeleteSuccess() {
+ // 鐢ㄦ埛鍒楄〃鍒犻櫎鎴愬姛
+ faceHandler.sendEmptyMessage(0);
+ }
+
+ @Override
+ public void userListDeleteFailure(String message) {
+ // 鐢ㄦ埛鍒楄〃鍒犻櫎澶辫触
+ faceHandler.sendEmptyMessage(0);
+ }
+ },
+ new DBLoadListener() {
+ @Override
+ public void onStart(int successCount) {
+
+ }
+
+ @Override
+ public void onLoad(int finishCount, int successCount, float progress) {
+
+ }
+
+ @Override
+ public void onComplete(List<User> features, int successCount) {
+
+ }
+
+ @Override
+ public void onFail(int finishCount, int successCount, List<User> features) {
+
+ }
+ });
+ }else {
+ faceHandler.sendEmptyMessage(0);
+ }
}
}
@@ -1041,14 +1109,21 @@
}
}
+ private UpdateUtil updateUtil;
private void checkUpdate(){
//鐗堟湰鏇存柊
- new UpdateUtil(this).setShowToast(false).getServerVerCode(new UpdateUtil.VersionCallBack() {
- @Override
- public void isNeedUpdate(boolean isUpdate) {
- isUpdateVersion = isUpdate;
- }
- });
+ if(updateUtil==null){
+ updateUtil = new UpdateUtil(this);
+ updateUtil.setShowToast(false);
+ }
+ if(!updateUtil.isShowing()){
+ updateUtil.getServerVerCode(new UpdateUtil.VersionCallBack() {
+ @Override
+ public void isNeedUpdate(boolean isUpdate) {
+ isUpdateVersion = isUpdate;
+ }
+ });
+ }
}
private PermissiondDialog permissiondDialog;
@@ -1080,7 +1155,7 @@
}
private int tipDownCount = 10;
- private int loopDownCount = 30;
+ private int loopDownCount = 60;
private boolean isShowTip;
@Subscribe
public void TimeClockEvent(TimeClockEvent e){
@@ -1095,9 +1170,10 @@
}
}
if(loopDownCount==0){
- loopDownCount = SpUtil.getInt("loop_time",30);
+ loopDownCount = SpUtil.getInt("loop_time",60);
//瀹氭椂鎷夊彇鍩烘湰淇℃伅
getVM().devLogin();
+ getPermission();
}else {
loopDownCount--;
}
@@ -1112,8 +1188,12 @@
public void OpenGridEvent(OpenGridEvent e){
if(!isFinishing()){
//寮�鍚煖闂�
- String code = "8A"+SportUtils.intToHex(Integer.parseInt(e.getBoardCode()))
- +SportUtils.intToHex(Integer.parseInt(e.getChannelCode()))+"11";
+ String key = e.getKey();
+ if(TextUtils.isEmpty(key)) {
+ key = SportUtils.intToHex(Integer.parseInt(e.getBoardCode()))
+ + SportUtils.intToHex(Integer.parseInt(e.getChannelCode()));
+ }
+ String code = "8A" + key + "11";
code += SportUtils.getBCC(code);
send485(0,code);
}
@@ -1176,38 +1256,6 @@
}
}
-
- @Subscribe
- public void CloseGridOneResultEvent(CloseGridOneResultEvent e){
- if(!isFinishing()&&isShowing){
- //鍦ㄩ椤碉紝鏍￠獙鍏抽棬鐨勯挜鍖欐槸鍚﹀尮閰�
- if (e.getIsOpen() == 0) {
- //鍏抽棬鎴愬姛
- //鏌ヨ閽ュ寵鍙�
- CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(e.getKey());
- if (gridDo != null) {
- getVM().addInfo("姣旇緝閽ュ寵锛氬綋鍓嶏細"+gridDo.getCurKeyCode()+", 鍏宠仈閽ュ寵锛�"+gridDo.getKeyCode());
- if(!TextUtils.isEmpty(gridDo.getCurKeyCode())&&
- !TextUtils.isEmpty(gridDo.getKeyCode())&&
- !gridDo.getCurKeyCode().equals(gridDo.getKeyCode())){
- //閽ュ寵涓嶄竴鏍凤紝寮�闂�
- ToastView.show(MApplication.mContext,gridDo.getCabinetName()+"閽ュ寵瀛樻斁浣嶇疆閿欒");
- EventBus.getDefault().post(new OpenGridEvent(Integer.parseInt(e.getKey().substring(2,4), 16)+"",
- Integer.parseInt(e.getKey().substring(0,2), 16)+""));
- }else {
- if(isShowTip){
- doRegister(5,null);
- }
- if(isShowing){
- //鍦ㄩ椤靛叧闂ㄦ垚鍔燂紝闇�璋冪敤鍏抽棬鏂规硶
- getVM().closeGrid(gridDo);
- }
- }
- }
- }
- }
- }
-
private SerialPortModel gridPort;
private SerialPortReadObserver gridReadObserver = new SerialPortReadObserver() {
@Override
@@ -1267,30 +1315,18 @@
if(gridDo!=null){
gridDo.setIsOpen("00".equals(open)?1:0);
gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
- //todo 鍘绘帀
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"=================>鏇存柊鏁版嵁褰撳墠閽ュ寵3锛�"+gridDo.getCurKeyCode()));
DaoManager.getCabinetGridDao().update(gridDo);
EventBus.getDefault().post(new ManageOpenGridResultEvent());
if(gridDo.getIsOpen()==0) {
//寮�闂ㄥけ璐�
- if (isShowing) {
- //棣栭〉寮�闂ㄥけ璐ワ紝閽ュ寵涓嶅
- if (!TextUtils.isEmpty(gridDo.getCurKeyCode()) &&
- !TextUtils.isEmpty(gridDo.getKeyCode()) &&
- !gridDo.getCurKeyCode().equals(gridDo.getKeyCode())) {
- //閽ュ寵涓嶄竴鏍凤紝寮�闂�
- ToastView.show(MApplication.mContext, gridDo.getCabinetName() + "閽ュ寵瀛樻斁浣嶇疆閿欒");
- EventBus.getDefault().post(new OpenGridEvent(Integer.parseInt(gridDo.getGridKey().substring(2, 4), 16) + "",
- Integer.parseInt(gridDo.getGridKey().substring(0, 2), 16) + ""));
- }
- }
+ EventBus.getDefault().post(new OpenErrEvent(key));
}else {
- //寮�闂ㄦ垚鍔�
+ //寮�闂ㄨ繑鍥�
+ EventBus.getDefault().post(new OpenGridOneResultEvent(key,"00".equals(open)?1:0));
}
}
- //寮�闂ㄨ繑鍥�
- EventBus.getDefault().post(new OpenGridOneResultEvent(key,"00".equals(open)?1:0));
+
}else if(data.length()==16){
//鎵归噺
//8A 02 00 00 00 00 11 99
@@ -1314,14 +1350,6 @@
updateList.add(gridDo);
}
}
- runOnUiThread(() -> {
- getVM().addInfo("鎵归噺寮�闂ㄦ洿鏂板簱鏁版嵁:鐗堝彿锛�" +bh+","+updateList.size());
- });
- //todo 鍘绘帀
- CabinetGridDo gridDo = oldMap.get("0101");
- if(gridDo!=null) {
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"=================>鏇存柊鏁版嵁褰撳墠閽ュ寵6锛�" + gridDo.getCurKeyCode()));
- }
getVM().updateGrids(updateList);
EventBus.getDefault().post(new ManageOpenGridResultEvent());
@@ -1341,9 +1369,6 @@
if(gridDo!=null){
gridDo.setIsOpen("00".equals(open)?1:0);
gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
- //todo 鍘绘帀
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"=================>鏇存柊鏁版嵁褰撳墠閽ュ寵3锛�"+gridDo.getCurKeyCode()));
-
DaoManager.getCabinetGridDao().update(gridDo);
}
//鍏抽棬杩斿洖
@@ -1393,12 +1418,6 @@
runOnUiThread(() -> {
getVM().addInfo("鏇存柊搴撴暟鎹�:鐗堝彿锛�" +bh+","+ addList.size()+","+updateList.size());
});
- //todo 鍘绘帀
- CabinetGridDo gridDo = oldMap.get("0101");
- if(gridDo!=null){
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+
- "=================>鏇存柊鏁版嵁褰撳墠閽ュ寵5锛�"+gridDo.getCurKeyCode()));
- }
getVM().updateGrids(updateList);
if(isShowing){
@@ -1451,7 +1470,7 @@
keyPreviousData = data;
}else if(data.startsWith("CC02")){
runOnUiThread(() -> {
- getVM().addInfo("鑾峰彇鍒伴挜鍖欐暟鎹�:" + data);
+ //getVM().addInfo("鑾峰彇鍒伴挜鍖欐暟鎹�:" + data);
jxKey(data);
});
keyPreviousData = null;
@@ -1459,7 +1478,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){
@@ -1552,12 +1571,9 @@
}
try {
runOnUiThread(() -> {
- //getVM().addInfo("鑾峰彇鍒伴厭绮炬娴嬫暟鎹�:"+StringUtil.DateToStrSS(new Date())+" " + new String(bytes));
+ getVM().addInfo("鑾峰彇鍒伴厭绮炬娴嬫暟鎹�:"+StringUtil.DateToStrSS(new Date())+" " + new String(bytes));
});
String data = new String(bytes);
- runOnUiThread(() -> {
- //getVM().addInfo("鑾峰彇鍒伴厭绮炬娴嬫槸鍚︽娴嬪け璐�:" + (data.contains("blow fail")));
- });
if(data.contains("blow fail")){
//妫�娴嬪け璐�
EventBus.getDefault().post(new JiujinResultEvent(false,null));
@@ -1691,18 +1707,35 @@
sendPortHandlerMsg(2,"A002010000000003",time+400);
}
+ private String jiu_blow;
+ private String jiu_mic_ad;
+ private String jiu_alarm;
+ private String jiu_unit;
private void setJiuConfig(long time){
CabinetConfigDataBean config = MApplication.getConfigBean().getCabinetConfigDataVO();
- //璁剧疆鍚规皵鏃堕棿
- sendPortHandlerMsg(3,"blow:"+config.getBlowTime(),time+100);
- //鍘嬪姏鍊�
- sendPortHandlerMsg(3,"mic_ad:"+config.getPressure(),time+300);
- //娴撳害闃堝��
- sendPortHandlerMsg(3,"alarm:"+config.getConcentration(),time+600);
- //娴撳害闃堝�煎崟浣� (1=mg/100ml;2=mg/L;3=%BAC)
- sendPortHandlerMsg(3,"unit:"+config.getThreshold(),time+900);
-
- sendPortHandlerMsg(3,"read"+config.getThreshold(),time+1200);
+ if(!config.getBlowTime().equals(jiu_blow)) {
+ //璁剧疆鍚规皵鏃堕棿
+ jiu_blow = config.getBlowTime();
+ sendPortHandlerMsg(3, "blow:" + config.getBlowTime(), time += 100);
+ }
+ if(!config.getPressure().equals(jiu_mic_ad)) {
+ //鍘嬪姏鍊�
+ jiu_mic_ad = config.getPressure();
+ sendPortHandlerMsg(3, "mic_ad:" + config.getPressure(), time += 300);
+ }
+ if(!config.getConcentration().equals(jiu_alarm)) {
+ //娴撳害闃堝��
+ jiu_alarm = config.getConcentration();
+ sendPortHandlerMsg(3, "alarm:" + config.getConcentration(), time += 300);
+ }
+ if("3".equals(config.getThreshold())){
+ config.setThreshold("0");
+ }
+ if(!config.getThreshold().equals(jiu_unit)) {
+ //娴撳害闃堝�煎崟浣� (1=mg/100ml;2=mg/L;3=%BAC)
+ jiu_unit = config.getThreshold();
+ sendPortHandlerMsg(3, "unit:" + config.getThreshold(), time += 300);
+ }
}
private void sendPortHandlerMsg(int what,String obj,long time){
@@ -1867,10 +1900,6 @@
runOnUiThread(new Runnable() {
@Override
public void run() {
- //todo 鍘绘帀
- if(type==2){
- return;
- }
getVM().addInfo("鍙戦�佹寚浠わ細"+StringUtil.DateToStrSS(new Date())+"==>"+code);
}
});
@@ -1937,4 +1966,124 @@
getVM().addInfo("涓插彛鍏ㄩ儴閾炬帴鎴愬姛锛�");
return true;
}
+
+ //寮�闂�
+ @Subscribe
+ public void OpenGridOneResultEvent(OpenGridOneResultEvent e){
+ if(!isFinishing()&&isShowing){
+ //寮�闂ㄦ垚鍔燂紝绉婚櫎寮�闂�
+ if(handler.hasMessages(1)){
+ handler.removeMessages(1);
+ getVM().addInfo("==绉婚櫎寮�闂ㄤ换鍔�");
+ }
+ }
+ }
+
+ private Long keyTime;
+ private HashMap<String,String> closeMap = new HashMap<>();
+ /**
+ * 鍏抽棬
+ * @param e
+ */
+ @Subscribe(threadMode= ThreadMode.MAIN)
+ public void CloseGridOneResultEvent(CloseGridOneResultEvent e){
+ if(!isFinishing()&&isShowing){
+ //鍏抽棬鎴愬姛锛岀Щ闄ゅ紑闂�
+ if(handler.hasMessages(1)){
+ handler.removeMessages(1);
+ getVM().addInfo("==绉婚櫎寮�闂ㄤ换鍔�");
+ }
+ closeMap.put(e.getKey(),"");
+ //鍙戦�佹煡璇㈤挜鍖欏彿
+ EventBus.getDefault().post(new GetKeyStatusEvent());
+ keyTime = new Date().getTime()+500;
+ if(handler.hasMessages(2)){
+ handler.removeMessages(2);
+ }
+ handler.sendEmptyMessageDelayed(2,1200);
+ }
+ }
+
+ @Subscribe(threadMode= ThreadMode.MAIN)
+ public void OpenErrEvent(OpenErrEvent e){
+ //寮�闂ㄥけ璐�
+ if(!isFinishing()&&isShowing){
+ //寮�闂�
+ if(handler.hasMessages(1)){
+ handler.removeMessages(1);
+ getVM().addInfo("==绉婚櫎寮�闂ㄤ换鍔�");
+ }
+ EventBus.getDefault().post(new OpenGridEvent(e.getKey()));
+ Message msg = Message.obtain();
+ msg.what=1;
+ msg.obj = e.getKey();
+ handler.sendMessageDelayed(msg,1000);
+ }
+ }
+
+ @Subscribe
+ public void KeyResultEvent(KeyResultEvent e){
+ if(!isFinishing()&&isShowing){
+ //鏍￠獙鏃堕棿
+ if(keyTime==null){
+ return;
+ }
+ if(keyTime!=null&&keyTime>System.currentTimeMillis()){
+ //鏍￠獙杩斿洖鏃堕棿<鍛戒护鏃堕棿
+ return;
+ }
+ if(handler.hasMessages(2)){
+ handler.removeMessages(2);
+ }
+
+ HashMap<String,String> copyMap = new HashMap<>();
+ copyMap.putAll(closeMap);
+ closeMap.clear();
+ //鏍￠獙鍗″彿涓嶅鐨勶紝鐩存帴寮瑰嚭
+ List<CabinetGridDo> gridDos = DaoManager.getCabinetGridDao().loadAll();
+ List<String> keys = new ArrayList<>();
+ StringBuilder sb = new StringBuilder();
+ for(CabinetGridDo gridDo:gridDos){
+ //瑕佸湪鑼冨洿鍐�
+ if(copyMap.containsKey(gridDo.getGridKey())){
+ boolean isFail = false;
+ if(TextUtils.isEmpty(gridDo.getGridKey())){
+ if(!TextUtils.isEmpty(gridDo.getCurKeyCode())&&gridDo.getIsOpen()==0){
+ //鏈粦瀹氱殑瀛樻斁浜嗛挜鍖�
+ keys.add(gridDo.getGridKey());
+ if(sb.length()>0){
+ sb.append("銆�");
+ }
+ sb.append(gridDo.getCabinetName());
+ isFail = true;
+ }
+ }else {
+ if(!TextUtils.isEmpty(gridDo.getCurKeyCode())){
+ if(!gridDo.getCurKeyCode().equals(gridDo.getKeyCode())&&gridDo.getIsOpen()==0){
+ //閽ュ寵涓嶅尮閰�
+ keys.add(gridDo.getGridKey());
+ if(sb.length()>0){
+ sb.append("銆�");
+ }
+ sb.append(gridDo.getCabinetName());
+ isFail = true;
+ }
+ }
+ }
+ if(!isFail){
+ //鍏抽棬鎴愬姛
+ EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"闂ㄥ叧闂垚鍔�***************************>鐩爣锛�"+gridDo.getKeyCode()+",褰撳墠锛�"+gridDo.getCurKeyCode()));
+ getVM().closeGrid(gridDo);
+ }
+ }
+ }
+ if(sb.length()>0){
+ ToastView.show(MApplication.mContext, sb.toString() + "閽ュ寵瀛樻斁浣嶇疆閿欒");
+ }
+ if(keys.size()>0){
+ //寮�闂�
+ EventBus.getDefault().post(new OpenGridListEvent(keys));
+ }
+ }
+ }
}
--
Gitblit v1.9.3