From fab8c02a0aa8f941a507bdcb3e4d72deb6eb2242 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 24 十月 2025 14:53:18 +0800
Subject: [PATCH] 钥匙柜
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java | 95 +++++++++++++++++++++--------------------------
1 files changed, 43 insertions(+), 52 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
index c248eb2..1b06374 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
@@ -39,11 +39,9 @@
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.request.transition.Transition;
import com.doumee.keyCabinet.BuildConfig;
-import com.doumee.keyCabinet.base.BannerPicResponsePara;
import com.doumee.keyCabinet.bean.CabinetConfigDataBean;
import com.doumee.keyCabinet.bean.DevConfigBean;
import com.doumee.keyCabinet.bean.FaceUserBean;
-import com.doumee.keyCabinet.bean.LoginBean;
import com.doumee.keyCabinet.dao.CabinetGridDo;
import com.doumee.keyCabinet.dao.DaoManager;
import com.doumee.keyCabinet.databinding.MainActivityBinding;
@@ -60,9 +58,9 @@
import com.doumee.keyCabinet.event.OpenGridEvent;
import com.doumee.keyCabinet.event.OpenGridListEvent;
import com.doumee.keyCabinet.event.OpenGridOneResultEvent;
-import com.doumee.keyCabinet.event.ReLoginEvent;
import com.doumee.keyCabinet.event.TimeClockEvent;
import com.doumee.keyCabinet.ui.face.ActivationActivity;
+import com.doumee.keyCabinet.ui.face.FaceActivity;
import com.doumee.keyCabinet.ui.keyCabinet.ChangeUrlActivity;
import com.doumee.keyCabinet.ui.keyCabinet.KeyCabinetActivity;
import com.doumee.keyCabinet.ui.keyCabinet.ManageLoginActivity;
@@ -273,6 +271,7 @@
getDB().tvId.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ startActivity(ManageLoginActivity.class);
//鏇存敼url
if(lastDownTime2!=null){
if(System.currentTimeMillis()-lastDownTime2>1000){
@@ -286,6 +285,13 @@
lastDownTime2=null;
startActivity(ChangeUrlActivity.class);
}
+ }
+ });
+ getDB().tvVersion.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ //todo 涓存椂浠ｇ爜
+ setJiuConfig();
}
});
upErrInfo();
@@ -305,6 +311,8 @@
}
private void setJiuConfig(){
+ getVM().addInfo("閰掔簿閰嶇疆锛�"+(MApplication.getConfigBean().getCabinetConfigDataVO()!=null)+
+ ",涓插彛寮�鍚細"+(jiuPort!=null));
if(MApplication.getConfigBean().getCabinetConfigDataVO()!=null&&
jiuPort!=null){
setJiuConfig(0);
@@ -355,49 +363,19 @@
case 2:
case 3: {
//鏍￠獙鏄惁鐧诲綍
- /*if(MApplication.getConfigBean().getId()==null){
+ if(MApplication.getConfigBean().getId()==null){
Toast.makeText(mContext, "璁惧鏈坊鍔狅紝鏃犳硶鎿嶄綔", Toast.LENGTH_SHORT).show();
getVM().devLogin();
return;
}
- MApplication.getLoginBean().setFlag(type==2?0:1);
- startActivity(FaceActivity.class);*/
- /*if(type==2){
- send485(1,"A002010000000003");
- }else {
- send485(1,"A001010000000002");
- }*/
- //send485(1,"A001010000000002");
- //send485(1,"A002010000000003");
- //startActivity(KeyCabinetActivity.class,b);
checkGridStatus(0);
List<CabinetGridDo> gridDos = getVM().getOpenGrids();
if (gridDos.size() > 0) {
- tipDownCount = 10;
- isShowTip = true;
- getDB().tvDjs.setText(tipDownCount + "s");
- StringBuilder sb = new StringBuilder();
- for(CabinetGridDo d:gridDos){
- if (sb.length()>0) {
- sb.append("銆�");
- }
- String name = d.getCabinetName();
- if (TextUtils.isEmpty(name)) {
- name = gridDos.get(0).getGridKey();
- }
- sb.append(name);
- }
-
- getDB().tvTip22.setText(getTipText(sb.toString()), TextView.BufferType.SPANNABLE);
- getDB().clTip.setVisibility(View.VISIBLE);
+ showUnCloseTip(gridDos);
return;
}
MApplication.setLoginBean(null);
MApplication.getLoginBean().setFlag(type == 2 ? 0 : 1);
- if(type==3){
- startActivity(ManageLoginActivity.class);
- return;
- }
startActivity(KeyCabinetActivity.class);
}
break;
@@ -408,22 +386,7 @@
case 5: {
List<CabinetGridDo> gridDos = getVM().getOpenGrids();
if (gridDos.size() > 0) {
- tipDownCount = 10;
- isShowTip = true;
- getDB().tvDjs.setText(tipDownCount + "s");
- StringBuilder sb = new StringBuilder();
- for(CabinetGridDo d:gridDos){
- if (sb.length()>0) {
- sb.append("銆�");
- }
- String name = d.getCabinetName();
- if (TextUtils.isEmpty(name)) {
- name = gridDos.get(0).getGridKey();
- }
- sb.append(name);
- }
- getDB().tvTip22.setText(getTipText(sb.toString()), TextView.BufferType.SPANNABLE);
- getDB().clTip.setVisibility(View.VISIBLE);
+ showUnCloseTip(gridDos);
}else {
isShowTip = false;
getDB().clTip.setVisibility(View.GONE);
@@ -436,6 +399,35 @@
default:
break;
}
+ }
+
+ private void showUnCloseTip(List<CabinetGridDo> gridDos){
+ tipDownCount = 10;
+ isShowTip = true;
+ getDB().tvDjs.setText(tipDownCount + "s");
+ StringBuilder sb = new StringBuilder();
+ for(CabinetGridDo d:gridDos){
+ if (sb.length()>0) {
+ sb.append("銆�");
+ }
+ String name = d.getCabinetName();
+ if (TextUtils.isEmpty(name)) {
+ name = gridDos.get(0).getGridKey();
+ }
+ sb.append(name);
+ }
+ getDB().tvTip22.setText(getTipText(sb.toString()), TextView.BufferType.SPANNABLE);
+ getDB().tvTip23.setText(getErrPhoneText(), TextView.BufferType.SPANNABLE);
+ getDB().clTip.setVisibility(View.VISIBLE);
+ }
+
+ private SpannableString getErrPhoneText(){
+ String phone = MApplication.getConfigBean().getLinkPhone();
+ String text = "濡傛湁闂璇疯仈绯荤鐞嗗憳"+phone;
+ SpannableString styledText = new SpannableString(text);
+ styledText.setSpan(new TextAppearanceSpan(this, R.style.style_tip3), 0, text.length()-phone.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ styledText.setSpan(new TextAppearanceSpan(this,R.style.style_tip1), text.length()-phone.length()+1, text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ return styledText;
}
private boolean isShowing = false;
@@ -1171,7 +1163,6 @@
EventBus.getDefault().post(new OpenGridEvent(Integer.parseInt(e.getKey().substring(2,4), 16)+"",
Integer.parseInt(e.getKey().substring(0,2), 16)+""));
}else {
- //todo 鍏抽棬鎴愬姛
if(isShowTip){
doRegister(5,null);
}
--
Gitblit v1.9.3