From 22881a4d6409c7d17867e1d40bf81a13578208df Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 31 十月 2025 15:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginActivity.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginActivity.java
index 288c1f4..2a1ffe1 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageLoginActivity.java
+++ b/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);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3