钥匙柜bug修改

weimingfei

2 天以前 445ba440b32fae364a39b8ef7822ecf3bd4e6abb

钥匙柜bug修改

 keyCabinet-android/app/build.gradle

@@ -11,7 +11,7 @@
        minSdkVersion build_versions.min_sdk
        targetSdkVersion build_versions.target_sdk
        versionCode 2
        versionName "1.0.1"
        versionName "1.0.2"

        //支持vectorDrawables矢量图
        vectorDrawables.useSupportLibrary = true

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

@@ -147,10 +147,12 @@
    }

    private boolean isOpening = false;
    private int doAction;
    @Override
    protected void doRegister(int type, ActionEventData data) {
        stopCountTimer();
        downTime = 30;
        doAction = type;
        switch (type){
            case 1:
                if(selectBean==null){
@@ -470,6 +472,9 @@
    public void KeyResultEvent(KeyResultEvent e){
        if(!isFinishing()){
            if(selectBean!=null){
                if(doAction==5||doAction==6||doAction==8||doAction==9){
                    return;
                }
                //校验时间
                if(keyTime==null){
                    return;

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

@@ -344,8 +344,8 @@
    }

    public void addInfo(String info){
        String s = infoObs.get();
        /*String s = infoObs.get();
        s=info+"\n"+s;
        infoObs.set(s);
        infoObs.set(s);*/
    }
}

 keyCabinet-android/app/src/main/res/layout/main_activity.xml

@@ -387,7 +387,8 @@
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:commandType="@{55}"
            app:onClickCommand="@{model.myTypeCommand}"/>
            app:onClickCommand="@{model.myTypeCommand}"
            android:visibility="gone"/>

        <ImageView
            android:id="@+id/img"
@@ -403,7 +404,7 @@
            android:layout_height="50dp"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            />
            android:visibility="gone"/>

        <TextView
            android:id="@+id/tv_m"