钥匙柜

weimingfei

13 小时以前 8d459194e620a691994fb8226fb08c51a3dd8065

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java

@@ -8,6 +8,7 @@
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.hardware.Camera;
import android.opengl.Visibility;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -30,6 +31,7 @@

import com.alibaba.fastjson.JSON;
import com.baidu.idl.main.facesdk.model.BDFaceSDKCommon;
import com.baidu.idl.main.facesdk.utils.StreamUtil;
import com.bigkoo.convenientbanner.holder.CBViewHolderCreator;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.DataSource;
@@ -47,11 +49,14 @@
import com.doumee.keyCabinet.databinding.MainActivityBinding;
import com.doumee.keyCabinet.event.CLGridEvent;
import com.doumee.keyCabinet.event.CLKeyEvent;
import com.doumee.keyCabinet.event.CheckGridStatusEvent;
import com.doumee.keyCabinet.event.CloseGridOneResultEvent;
import com.doumee.keyCabinet.event.GetFacesEvent;
import com.doumee.keyCabinet.event.GetKeyStatusEvent;
import com.doumee.keyCabinet.event.HeartEvent;
import com.doumee.keyCabinet.event.HttpEvent;
import com.doumee.keyCabinet.event.JiujinBeginEvent;
import com.doumee.keyCabinet.event.JiujinResultEvent;
import com.doumee.keyCabinet.event.KeyResultEvent;
import com.doumee.keyCabinet.event.ManageOpenGridResultEvent;
import com.doumee.keyCabinet.event.OpenAllGridEvent;
@@ -72,6 +77,7 @@
import com.doumee.keyCabinet.ui.face.UserManagerActivity;
import com.doumee.keyCabinet.ui.view.BannerViewImageHolder;
import com.doumee.keyCabinet.utils.BraceletLogUtils;
import com.doumee.keyCabinet.utils.CircularQueue;
import com.doumee.keyCabinet.utils.CrashHandler;
import com.doumee.keyCabinet.utils.LMobileInfo;
import com.doumee.keyCabinet.utils.TimeUtils;
@@ -95,11 +101,13 @@
import com.doumee.lib_coremodel.http.utils.GsonTools;
import com.doumee.lib_coremodel.util.SpUtil;
import com.doumee.lib_coremodel.util.StringUtil;
import com.doumee.lib_coremodel.view.ToastView;
import com.example.datalibrary.api.FaceApi;
import com.example.datalibrary.listener.DBLoadListener;
import com.example.datalibrary.listener.SdkInitListener;
import com.example.datalibrary.model.ImportFeatureResult;
import com.example.datalibrary.model.User;
import com.example.datalibrary.utils.ToastUtils;
import com.example.datalibrary.view.PreviewTexture;
import com.yanzhenjie.permission.runtime.Permission;

@@ -107,6 +115,7 @@
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -115,6 +124,8 @@
import java.util.TimerTask;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import dagger.hilt.android.AndroidEntryPoint;
import timber.log.Timber;
@@ -151,7 +162,7 @@
            if(!isFinishing()){
                switch (msg.what) {
                    case 0:
                    //initM();
                    initM();
                    TimeUtils.updateTimeUi(getVM().dayObs, getVM().timeObs);
                    handler.sendEmptyMessageDelayed(0, 1000);
                    EventBus.getDefault().post(new TimeClockEvent());
@@ -180,7 +191,7 @@
        SpUtil.initWH(this);
        normalConfig();
        getDB().setModel(getVM());
        //initRGBCheck();
        initRGBCheck();
        handler.sendEmptyMessageDelayed(0, 1000);
        //启动心跳
        Intent intent = new Intent(MainActivity.this, HeartbeatService.class);
@@ -190,7 +201,6 @@
        startService(intent2);
        getPermission();
        Timber.tag("====>").d(LMobileInfo.getDeviceUniqueId());
        initPort();
    }

    private void initM(){
@@ -205,7 +215,7 @@
        if((availableMemory<400&&showTime!=null&&(System.currentTimeMillis()-showTime>5000))||
                ("02:00:00".equals(StringUtil.getHM()))){
            //可用内存小于400M,或者每天凌晨2点，重启app
            restartApp();
            //restartApp();
        }
    }

@@ -271,7 +281,6 @@
        getDB().tvId.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(ManageLoginActivity.class);
                //更改url
                if(lastDownTime2!=null){
                    if(System.currentTimeMillis()-lastDownTime2>1000){
@@ -291,7 +300,20 @@
            @Override
            public void onClick(View v) {
                //todo 临时代码
                setJiuConfig();
                //setJiuConfig();
                SpUtil.saveString("rbgCameraId","0");
            }
        });
        getDB().imgLeft.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                //todo 临时代码
                if (getDB().nsv.getVisibility()== View.VISIBLE) {
                    getDB().nsv.setVisibility(View.GONE);
                }else {
                    getDB().nsv.setVisibility(View.VISIBLE);
                }

            }
        });
        upErrInfo();
@@ -305,6 +327,7 @@
                        setBanner(devConfigBean.getBannerList());
                    }
                    setJiuConfig();
                    initPort();
                }
            }
        });
@@ -376,7 +399,7 @@
                }
                MApplication.setLoginBean(null);
                MApplication.getLoginBean().setFlag(type == 2 ? 0 : 1);
                startActivity(KeyCabinetActivity.class);
                startActivity(FaceActivity.class);
                }
                break;
            case 4:
@@ -437,7 +460,7 @@
        isShowing = true;
        showTime = System.currentTimeMillis();
        if(!isFaceOk) {
            //initLicense();
            initLicense();
        }
        if(isHavePermission) {
            checkUpdate();
@@ -449,7 +472,9 @@
        }else {
            getDB().banner.stopTurning();
        }
        unCloseGrid();
        //检查所有柜格门、钥匙状态
        checkKeyStatus(0);
        checkGridStatus(900);
    }

    private void unCloseGrid(){
@@ -808,7 +833,7 @@
                                if (ret == 128) {
                                    Timber.d("==UpdatingFace==>图片特征抽取成功: %s", JSON.toJSONString(bean));
                                    User user = new User();
                                    user.setUserId(bean.getMemberId());
                                    user.setUserId(bean.getMemberId().toString());
                                    user.setGroupId(bean.getGroupId());
                                    user.setUserName(bean.getMemberName());
                                    user.setImageName(bean.getFaceImg());
@@ -896,7 +921,6 @@
        popupWindow.showAtLocation(getDB().clRoot, Gravity.CENTER, 0, 0);
        RelativeLayout relativeRegister = contentView.findViewById(R.id.relative_register);
        RelativeLayout mPopRelativeManager = contentView.findViewById(R.id.relative_manager);
        RelativeLayout mPopRelativeCamra = contentView.findViewById(R.id.relative_camra);
        RelativeLayout mRlErr = contentView.findViewById(R.id.rl_err);
        relativeRegister.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -908,12 +932,6 @@
            @Override
            public void onClick(View v) {
                startActivity(UserManagerActivity.class);
            }
        });
        mPopRelativeCamra.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                //startActivity();
            }
        });
        mRlErr.setOnClickListener(new View.OnClickListener() {
@@ -938,15 +956,10 @@
    }

    private void initRGBCheck(){
        if(true){
            return;
        }
        String index = SpUtil.getString("rbgCameraId");
        if(index==null){
            index = "0";
        }
        String index = SpUtil.getString("rbgCameraId","0");
        setRgbCameraId(Integer.parseInt(index));
        /*if (isSetCameraId()){
            setRgbCameraId(SingleBaseConfig.getBaseConfig().getRBGCameraId());
            return;
        }
        int mCameraNum = Camera.getNumberOfCameras();
@@ -997,6 +1010,7 @@
    }

    private void setRgbCameraId(int index){
        getVM().addInfo("设置相机："+index);
        //Toast.makeText(mContext, "设置相机"+index, Toast.LENGTH_SHORT).show();
        SpUtil.saveString("rbgCameraId",index+"");
        BraceletLogUtils.saveLog("设置相机("+index+")");
@@ -1066,16 +1080,26 @@
    }

    private int tipDownCount = 10;
    private int loopDownCount = 30;
    private boolean isShowTip;
    @Subscribe
    public void TimeClockEvent(TimeClockEvent e){
        if(isShowTip){
            if(tipDownCount==0){
                isShowTip = false;
                getDB().clTip.setVisibility(View.GONE);
        if(!isFinishing()) {
            if(isShowTip){
                if(tipDownCount==0){
                    isShowTip = false;
                    getDB().clTip.setVisibility(View.GONE);
                }else {
                    tipDownCount--;
                    getDB().tvDjs.setText(tipDownCount+"s");
                }
            }
            if(loopDownCount==0){
                loopDownCount = SpUtil.getInt("loop_time",30);
                //定时拉取基本信息
                getVM().devLogin();
            }else {
                tipDownCount--;
                getDB().tvDjs.setText(tipDownCount+"s");
                loopDownCount--;
            }
        }
    }
@@ -1144,6 +1168,14 @@
        }
    }

    @Subscribe(threadMode = ThreadMode.MAIN)
    public void JiujinBeginEvent(JiujinBeginEvent e){
        if(!isFinishing()){
            //开启酒精检测
            sendPortHandlerMsg(3,"go_wnd:0",0);
        }
    }


    @Subscribe
    public void CloseGridOneResultEvent(CloseGridOneResultEvent e){
@@ -1159,7 +1191,7 @@
                            !TextUtils.isEmpty(gridDo.getKeyCode())&&
                            !gridDo.getCurKeyCode().equals(gridDo.getKeyCode())){
                        //钥匙不一样，开门
                        Toast.makeText(mContext, "钥匙存放位置错误", Toast.LENGTH_SHORT).show();
                        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 {
@@ -1194,6 +1226,9 @@

        @Override
        public void onResultBytes(byte[] bytes) {
            if(isFinishing()){
                return;
            }
            if(bytes.length==0){
                return;
            }
@@ -1229,23 +1264,33 @@
                    });*/
                    String key = bh+tdh;
                    CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
                    if(gridDo==null){
                        //新增
                        gridDo = new CabinetGridDo();
                        gridDo.setIsOpen("00".equals(open)?1:0);
                        gridDo.setGridKey(key);
                        gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
                        DaoManager.getCabinetGridDao().insert(gridDo);
                    }else {
                    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) + ""));
                                }
                            }
                        }else {
                            //开门成功
                        }
                    }
                    //开门返回
                    EventBus.getDefault().post(new OpenGridOneResultEvent(key,gridDo.getIsOpen()));
                    if(!portHandler.hasMessages(1)){
                        EventBus.getDefault().post(new ManageOpenGridResultEvent());
                    }
                    EventBus.getDefault().post(new OpenGridOneResultEvent(key,"00".equals(open)?1:0));
                }else if(data.length()==16){
                    //批量
                    //8A 02 00 00 00 00 11 99
@@ -1258,12 +1303,7 @@
                    for(CabinetGridDo d:gridDos){
                        oldMap.put(d.getGridKey(),d);
                    }
                    List<CabinetGridDo> addList = new ArrayList<>();
                    List<CabinetGridDo> updateList = new ArrayList<>();
                    String finalDm = dm;
                    /*runOnUiThread(() -> {
                        getVM().addInfo("批量查询返回：" +bh+","+ finalDm+",总数据："+oldMap.size());
                    });*/
                    try {
                        for(int i=1;i<=dm.length();i++){
                            String key = bh+SportUtils.intToHex(i);
@@ -1272,23 +1312,19 @@
                                gridDo.setIsOpen("1".equals(dm.substring(i-1,i))?0:1);
                                gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
                                updateList.add(gridDo);
                            }/*else {
                                getVM().addInfo("新增key：" +key);
                                CabinetGridDo gridDo = new CabinetGridDo();
                                gridDo.setGridKey(key);
                                gridDo.setIsOpen("1".equals(dm.substring(i-1,i))?0:1);
                                gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
                                addList.add(gridDo);
                            }*/
                            }
                        }
                        runOnUiThread(() -> {
                            getVM().addInfo("批量开门更新库数据:版号：" +bh+","+ addList.size()+","+updateList.size());
                            getVM().addInfo("批量开门更新库数据:版号：" +bh+","+updateList.size());
                        });
                        getVM().insertGrids(addList);
                        getVM().updateGrids(updateList);
                        if(!portHandler.hasMessages(1)){
                            EventBus.getDefault().post(new ManageOpenGridResultEvent());
                        //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());
                    }catch (Exception exception){
                        runOnUiThread(() -> {
                            getVM().addInfo("批量开门报错：" +exception.getMessage());
@@ -1302,20 +1338,16 @@
                String open = data.substring(6,8);
                String key = bh+tdh;
                CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
                if(gridDo==null){
                    //新增
                    gridDo = new CabinetGridDo();
                    gridDo.setIsOpen("00".equals(open)?1:0);
                    gridDo.setGridKey(key);
                    gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
                    DaoManager.getCabinetGridDao().insert(gridDo);
                }else {
                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 CloseGridOneResultEvent(key,gridDo.getIsOpen()));
                EventBus.getDefault().post(new CloseGridOneResultEvent(key,"00".equals(open)?1:0));
                if(isShowing&&isShowTip){
                    //修改显示提醒
                    doRegister(5,null);
@@ -1356,19 +1388,22 @@
                                gridDo.setIsOpen("1".equals(dm.substring(i-1,i))?0:1);
                                gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
                                updateList.add(gridDo);
                            }else {
                                CabinetGridDo gridDo = new CabinetGridDo();
                                gridDo.setGridKey(key);
                                gridDo.setIsOpen("1".equals(dm.substring(i-1,i))?0:1);
                                gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
                                addList.add(gridDo);
                            }
                        }
                        runOnUiThread(() -> {
                            getVM().addInfo("更新库数据:版号：" +bh+","+ addList.size()+","+updateList.size());
                        });
                        getVM().insertGrids(addList);
                        //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){
                            unCloseGrid();
                        }
                    }catch (Exception exception){
                        runOnUiThread(() -> {
                            getVM().addInfo("报错：" +exception.getMessage());
@@ -1395,6 +1430,9 @@

        @Override
        public void onResultBytes(byte[] bytes) {
            if(isFinishing()){
                return;
            }
            if(bytes.length==0){
                return;
            }
@@ -1422,7 +1460,15 @@
                    String data2 = keyPreviousData+data;
                    runOnUiThread(() -> {
                        getVM().addInfo("获取到钥匙数据:" + data2);
                        jxKey(data2);
                        if(data2.contains("CC01")&&data2.contains("CC02")){
                            String[] sp = data2.split("CC02");
                            if(sp.length==2){
                                jxKey(sp[0]);
                                jxKey("CC02"+sp[1]);
                            }
                        }else {
                            jxKey(data2);
                        }
                    });
                    keyPreviousData = null;
                }
@@ -1465,23 +1511,22 @@
                    }else {
                        gridDo.setCurKeyCode("");
                    }
                    gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
                    updateList.add(gridDo);
                }else {
                    //新增
                    CabinetGridDo gridDo = new CabinetGridDo();
                    gridDo.setGridKey(key);
                    if("01".equals(isHaveKey)) {
                        gridDo.setCurKeyCode(keyCode);
                    }else {
                        gridDo.setCurKeyCode("");
                    if("0101".equals(key)) {
                        getVM().addInfo(key+" , "+isHaveKey+"  "+keyCode);
                        getVM().addInfo(key + "设置钥匙：" + gridDo.getCurKeyCode());
                    }
                    gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
                    addList.add(gridDo);
                    updateList.add(gridDo);
                }
            }
        }
        getVM().insertGrids(addList);
        //todo 去掉
        CabinetGridDo gridDo = oldMap.get("0101");
        if(gridDo!=null) {
            EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+
                    "=================>更新数据当前钥匙7：" + gridDo.getCurKeyCode()));
        }

        getVM().updateGrids(updateList);
        EventBus.getDefault().post(new KeyResultEvent());
    }
@@ -1499,12 +1544,33 @@

        @Override
        public void onResultBytes(byte[] bytes) {
            if(isFinishing()){
                return;
            }
            if(bytes.length==0){
                return;
            }
            runOnUiThread(() -> {
                getVM().addInfo("获取到酒精检测数据:" + new String(bytes));
            });
            try {
                runOnUiThread(() -> {
                    //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));
                }else if(data.startsWith("Result:")){
                    Pattern pattern = Pattern.compile("([0-9]+\\.[0-9]+)");
                    Matcher matcher = pattern.matcher(data);
                    if (matcher.find()) {
                        EventBus.getDefault().post(new JiujinResultEvent(true,new BigDecimal(matcher.group(1))));
                    }
                }
            }catch (Exception e){
                getVM().addInfo("获取到酒精检测报错:" + e.getMessage());
            }
        }
    };
    private SerialPortModel chosePort;
@@ -1606,6 +1672,13 @@
        }
    };

    @Subscribe(threadMode = ThreadMode.MAIN)
    public void CheckGridStatusEvent(CheckGridStatusEvent e){
        if(!isFinishing()){
            checkGridStatus(0);
        }
    }

    //检查所有门状态
    private void checkGridStatus(long time){
        sendPortHandlerMsg(1,"80010033B2",time+100);
@@ -1628,6 +1701,8 @@
        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);
    }

    private void sendPortHandlerMsg(int what,String obj,long time){
@@ -1637,20 +1712,24 @@
        portHandler.sendMessageDelayed(mc,time);
    }

    private boolean isInitPort;
    //初始化串口
    private void initPort(){
        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"))){
            if(isInitPort){
                return;
            }
            xhCount=0;
            closePort(chosePort);
            if(!TextUtils.isEmpty(SpUtil.getString("port_grid"))){
@@ -1661,6 +1740,7 @@
                        ,1 , 0,gridReadObserver);
                boolean isSucc = gridPort.open();
                if(isSucc) {
                    isInitPort = true;
                    getVM().addInfo("门串口链接成功："+path);
                    String msg = isSucc ? "成功" : "失败";
                    //getVM().append("串口 "+ settingBean.getDevicePath() + " -连接"+msg);
@@ -1678,6 +1758,7 @@
                        ,1 , 0,keyReadObserver);
                boolean isSucc = keyPort.open();
                if(isSucc) {
                    isInitPort = true;
                    getVM().addInfo("钥匙串口链接成功："+path);
                    String msg = isSucc ? "成功" : "失败";
                    //getVM().append("串口 "+ settingBean.getDevicePath() + " -连接"+msg);
@@ -1694,6 +1775,7 @@
                        ,1 , 0,jiuReadObserver);
                boolean isSucc = jiuPort.open();
                if(isSucc) {
                    isInitPort = true;
                    getVM().addInfo("酒精串口链接成功："+path);
                    String msg = isSucc ? "成功" : "失败";
                    //getVM().append("串口 "+ settingBean.getDevicePath() + " -连接"+msg);
@@ -1780,15 +1862,23 @@
        portHandler.sendEmptyMessageDelayed(0,0);
    }

    private CircularQueue openGridQueue = new CircularQueue();
    private void send485(int type,String code){
        runOnUiThread(new Runnable() {
            @Override
            public void run() {
                //todo 去掉
                if(type==2){
                    return;
                }
                getVM().addInfo("发送指令："+StringUtil.DateToStrSS(new Date())+"==>"+code);
            }
        });
        if(type==0){
            if(gridPort!=null){
                if(code.startsWith("8A")){
                    openGridQueue.enqueue(code);
                }
                byte[] sendByte = SportUtils.hexToByteArray(code);
                gridPort.write(sendByte);
            }