Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

昨天 22881a4d6409c7d17867e1d40bf81a13578208df

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

@@ -11,12 +11,14 @@
import android.widget.Toast;

import com.doumee.keyCabinet.BuildConfig;
import com.doumee.keyCabinet.MApplication;
import com.doumee.keyCabinet.R;
import com.doumee.keyCabinet.base.MyBaseActivity;
import com.doumee.keyCabinet.databinding.ManageLoginActivityBinding;
import com.doumee.keyCabinet.event.TimeClockEvent;
import com.doumee.keyCabinet.utils.LMobileInfo;
import com.doumee.lib_coremodel.bean.event.ActionEventData;
import com.innohi.YNHAPI;

import org.greenrobot.eventbus.Subscribe;

@@ -33,7 +35,8 @@

    @Override
    public void initView(@Nullable Bundle savedInstanceState) {
        isAddCountTimer = false;
        downTime = 30;
        isAddCountTimer = true;
        normalConfig();
        getDB().setModel(getVM());
    }
@@ -43,7 +46,18 @@
        getDB().tvNo.setText("NO："+ LMobileInfo.getDeviceUniqueId());
        getDB().tvV.setText("V"+ BuildConfig.VERSION_NAME);


        getDB().tv1.setOnLongClickListener(new View.OnLongClickListener() {
            @Override
            public boolean onLongClick(View v) {
                if(MApplication.getConfigBean().getId()==null){
                    //可以下拉
                    YNHAPI mAPI = YNHAPI.getInstance();
                    mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.VISIBLE);
                    return true;
                }
                return false;
            }
        });
    }

    @Override
@@ -66,9 +80,7 @@
                getVM().loginCabinet(getDB().etName.getText().toString(),getDB().etPw.getText().toString());
                break;
            case 3:
                //显示加载
                getDB().clProgress.setVisibility(View.VISIBLE);
                getDB().clTip.setVisibility(View.GONE);
                finish();
                break;
            case 4:
                getDB().clProgress.setVisibility(View.GONE);
@@ -79,6 +91,11 @@
            case 5:
                startActivity(ManageCabinetActivity.class);
                finish();
                break;
            case 6:
                //显示加载
                getDB().clProgress.setVisibility(View.VISIBLE);
                getDB().clTip.setVisibility(View.GONE);
                break;
            default:
                break;
@@ -112,4 +129,9 @@
            }
        }
    }

    @Override
    protected void timeChange(String djs) {
        getDB().tvDjs.setText(djs);
    }
}