weimingfei
5 天以前 3c5e5ed692e2e5248080b064b7d14b8eb9988a8c
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
@@ -37,12 +37,12 @@
import com.doumee.keyCabinet.event.OpenGridOneResultEvent;
import com.doumee.keyCabinet.event.TimeClockEvent;
import com.doumee.keyCabinet.ui.keyCabinet.adapter.ManageCabinetRcvAdapter;
import com.doumee.keyCabinet.utils.MCUtils;
import com.doumee.keyCabinet.utils.i485.SportUtils;
import com.doumee.lib_coremodel.bean.event.ActionEventData;
import com.doumee.lib_coremodel.util.RecyclerHelp;
import com.doumee.lib_coremodel.util.StringUtil;
import com.example.datalibrary.db.DBManager;
import com.innohi.YNHAPI;
import com.proembed.service.MyService;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -110,8 +110,8 @@
            @Override
            public boolean onLongClick(View v) {
                //可以下拉
                YNHAPI mAPI = YNHAPI.getInstance();
                mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.VISIBLE);
                MyService myService = new MyService(ManageCabinetActivity.this);
                MCUtils.show(myService);
                return true;
            }
        });
@@ -570,7 +570,7 @@
            }
            //发送查询钥匙号
            EventBus.getDefault().post(new GetKeyStatusEvent());
            keyTime = new Date().getTime()+500;
            keyTime = new Date().getTime()+100;
            if(handler.hasMessages(0)){
                handler.removeMessages(0);
            }
@@ -673,8 +673,25 @@
                if(!isFail){
                    if(copyMap.containsKey(gridDo.getGridKey())){
                        //关门成功
                        EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"门关闭成功***************************>目标:"+gridDo.getKeyCode()+",当前:"+gridDo.getCurKeyCode()));
                        getVM().closeGrid(gridDo);
                        boolean isSend = false;
                        String bh = gridDo.getGridKey().substring(0,2);
                        if("1".equals(e.getType())){
                            //1号板
                            if("01".equals(bh)){
                                isSend = true;
                            }
                        }else if("2".equals(e.getType())){
                            //2号板
                            if("02".equals(bh)){
                                isSend = true;
                            }
                        }else {
                            isSend = true;
                        }
                        if(isSend) {
                            EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date()) + "门关闭成功***************************>目标:" + gridDo.getKeyCode() + ",当前:" + gridDo.getCurKeyCode()));
                            getVM().closeGrid(gridDo);
                        }
                    }
                }
            }