From 6c12dd77bc481aeabec568bfed3dd68e81b80f8b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 20 十月 2025 08:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/guide/GuideActivity.java | 36 ++----------------------------------
1 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/guide/GuideActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/guide/GuideActivity.java
index e71c61e..035962b 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/guide/GuideActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/guide/GuideActivity.java
@@ -20,7 +20,6 @@
import com.doumee.keyCabinet.MApplication;
import com.doumee.keyCabinet.R;
import com.doumee.keyCabinet.base.MyBaseActivity;
-import com.doumee.keyCabinet.bean.ConfigBean;
import com.doumee.keyCabinet.bean.DevConfigBean;
import com.doumee.keyCabinet.ui.main.MainActivity;
import com.doumee.keyCabinet.utils.LanguageUtil;
@@ -42,12 +41,12 @@
public void handleMessage(@NonNull Message msg) {
switch (msg.what) {
case 1:
- if(MApplication.getConfigBean().getShopId()==null){
+ /*if(MApplication.getConfigBean().getShopId()==null){
if(isHavePermission){
handler.sendEmptyMessageDelayed(2,20000);
getVM().devLogin();
}
- }
+ }*/
break;
case 2:
getVM().resetReq();
@@ -75,38 +74,7 @@
@Override
public void initData(@Nullable Bundle savedInstanceState) {
- getVM().getDevLD().observe(this, new Observer<DevConfigBean>() {
- @Override
- public void onChanged(DevConfigBean devConfigBean) {
- if(devConfigBean!=null){
- ConfigBean configBean = new ConfigBean();
- configBean.setShopId(devConfigBean.getShopId());
- configBean.setCapacity(devConfigBean.getCapacity());
- configBean.setMoney(devConfigBean.getMoney());
- configBean.setCategory(devConfigBean.getCategory());
- configBean.setCurNum(devConfigBean.getCurNum());
- configBean.setName(devConfigBean.getName());
- configBean.setGymId(devConfigBean.getVenueId());
- configBean.setLanguage(devConfigBean.getLanguage());
- String language = devConfigBean.getLanguage();
- if(!TextUtils.isEmpty(language)){
- //杞皬鍐�
- language = language.toLowerCase();
- if("zh".equals(language)){
- MApplication.nLan = 0;
- }else {
- MApplication.nLan = 1;
- }
- }
- SpUtil.saveString("language",language);
- LanguageUtil.changeAppLanguage(GuideActivity.this,language);
- MApplication.saveConfigBean(configBean);
- startActivity(MainActivity.class);
- finish();
- }
- }
- });
}
private boolean isHavePermission = false;
--
Gitblit v1.9.3