From cb6aca0642ac8dd5de877ade168066d85acb589c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 十月 2025 15:54:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/guide/GuideViewModel.java | 70 -----------------------------------
1 files changed, 0 insertions(+), 70 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/guide/GuideViewModel.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/guide/GuideViewModel.java
index 9074a33..6b22d38 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/guide/GuideViewModel.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/guide/GuideViewModel.java
@@ -11,11 +11,6 @@
import com.doumee.keyCabinet.http.param.DevLoginParam;
import com.doumee.lib_coremodel.base.BaseModel;
import com.doumee.lib_coremodel.base.DataViewModel;
-import com.doumee.lib_coremodel.http.rxJava.SimpleObserver;
-import com.doumee.lib_coremodel.http.utils.RxUtils;
-import com.doumee.keyCabinet.MApplication;
-import com.doumee.keyCabinet.R;
-import com.doumee.keyCabinet.bean.ConfigBean;
import com.doumee.keyCabinet.bean.DevConfigBean;
import com.doumee.keyCabinet.http.Apis;
import com.doumee.keyCabinet.http.param.BaseResponse;
@@ -54,72 +49,7 @@
doAction(1);
}
public void devLogin(){
- if (true) {
- return;
- }
- if(isReq){
- return;
- }
- isReq = true;
- //娓呴櫎鐧诲綍淇℃伅
- MApplication.setCookie("");
- MApplication.saveConfigBean(new ConfigBean());
- RequestBaseObject<DevLoginParam> request = new RequestBaseObject<>();
- DevLoginParam param = new DevLoginParam();
- param.setDevCode(LMobileInfo.getDeviceUniqueId());
- request.setParam(param);
- getRetrofitService(Apis.class).devLogin(0,
- ParamsUtil.encodeRequestBody(request))
- .compose(RxUtils.schedulersTransformer())
- .subscribe(new SimpleObserver<Response<BaseResponse<DevConfigBean>>>(rxJavaGcManager) {
- @Override
- public void onNext(@NonNull Response<BaseResponse<DevConfigBean>> base) {
- Headers headers = base.headers();//鎴戜滑閫氳繃Response鐨刪eaders瀵硅薄鑾峰彇鍒板搷搴斿ご淇℃伅銆�
- List<String> values = headers.values("Set-Cookie");//閫氳繃鈥淪et-Cookie鈥濆瓧娈佃幏鍙栧埌鏈嶅姟鍣ㄨ繑鍥炵殑Cookie淇℃伅
- if(values!=null&&values.size()>0){
- MApplication.setCookie(values.get(0));
- }
- BaseResponse<DevConfigBean> response = base.body();
- if(response==null){
- toast(MApplication.mContext.getString(R.string.guide_toast_1));
- doAction(1);
- return;
- }
- if("000000".equals(response.getErrorCode())){
- if(response.getRecord()!=null){
- if("0".equals(response.getRecord().getStatus())){
- jyVisibility.set(View.VISIBLE);
- doAction(1);
- return;
- }else {
- jyVisibility.set(View.GONE);
- }
- devLD.setValue(response.getRecord());
- }else {
- toast(MApplication.mContext.getString(R.string.guide_toast_1));
- doAction(1);
- }
- }else if("33010101".equals(response.getErrorCode())) {
- doAction(1);
- toast(MApplication.mContext.getString(R.string.guide_toast_2)+
- MApplication.mContext.getString(R.string.symbol_colon)+param.getDevCode());
- }else {
- toast(response.getErrorMsg());
- doAction(1);
- }
- }
- @Override
- public void onError(@NonNull Throwable e) {
- toast(e.getMessage());
- doAction(1);
- }
-
- @Override
- public void onComplete() {
- isReq = false;
- }
- });
}
public MutableLiveData<DevConfigBean> getDevLD() {
--
Gitblit v1.9.3