添加补打逻辑 联调修复bug

zuoxiao

2024-08-16 a44c47bc7f37245612635866adaddf5c98d41747

 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/QHOnLineApplication.java

@@ -5,6 +5,7 @@
import android.content.Context;
import android.content.Intent;

import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.ToastUtil;
import com.dayu.qiheonlinelibrary.bean.LoginResult;
import com.dayu.qiheonlinelibrary.bean.PricePlanResult;
@@ -40,6 +41,8 @@

    public String electriclePriceStr;//电价

    public String adminId;//登录的账号id

    public static QHOnLineApplication getInstance(Application context) {
        if (qhAloneApplication == null) {
            qhAloneApplication = new QHOnLineApplication();
@@ -61,11 +64,13 @@
        Map<String, Object> data = new HashMap<>();
        data.put("loginType", "account");

        ApiManager.getInstance().requestPostLoading(context, "api/login/getPubKey", String.class, null, new SubscriberListener<BaseResponse<String>>() {
        ApiManager.getInstance().requestPostLoading(context, "http://120.46.45.35:20081/api/login/getPubKey", String.class, null, new SubscriberListener<BaseResponse<String>>() {
            @Override
            public void onNext(BaseResponse<String> t) {
                if (t.isSuccess()) {
                    getToken(context, name, pw, t.getData());
                    if (t.getData() != null) {
                        getToken(context, name, pw, t.getData());
                    }
                }
            }
        });
@@ -79,12 +84,14 @@
        String dateString = sdf.format(new Date());
        data.put("password", RSAUtile.encryptByPublicKey(pw + "@TIME@" + dateString, pubKey));
        data.put("username", name);
        ApiManager.getInstance().requestPostLoading(application, "api/login/login/getToken", String.class, data, new SubscriberListener<BaseResponse<String>>() {
        ApiManager.getInstance().requestPostLoading(application, "http://120.46.45.35:20081/api/login/login/getToken", String.class, data, new SubscriberListener<BaseResponse<String>>() {
            @Override
            public void onNext(BaseResponse<String> t) {
                if (t.isSuccess()) {
                    tokenStr = t.getData();
                    login(context, name, pw, pubKey);
                    if (t.getData() != null) {
                        tokenStr = t.getData();
                        login(context, name, pw, pubKey);
                    }
                } else {
                    ToastUtil.show(t.getMsg());
                }
@@ -100,25 +107,34 @@
        String dateString = sdf.format(new Date());
        data.put("password", RSAUtile.encryptByPublicKey(pw + "@TIME@" + dateString, pubKey));
        data.put("username", name);
        ApiManager.getInstance().requestPostLoading(application, "api/login/login", LoginResult.class, data, new SubscriberListener<BaseResponse<LoginResult>>() {
        ApiManager.getInstance().requestPostLoading(application, "http://120.46.45.35:20081/api/login/login", LoginResult.class, data, new SubscriberListener<BaseResponse<LoginResult>>() {
            @Override
            public void onNext(BaseResponse<LoginResult> t) {
                if (t.isSuccess()) {
                    if (t.getData() != null && t.getData().getOtherData() != null) {
                        LoginResult.OtherData otherData = t.getData().getOtherData();
                        String tenantAdnm = otherData.getTenantAdnm();
                        List<String> adnmList = otherData.getAdnmList();
                        if (tenantAdnm != null && adnmList != null && !adnmList.isEmpty()) {
                            addressName = tenantAdnm + adnmList.get(0);
                    try {
                        if (t.getData() != null && t.getData().getOtherData() != null) {

                            LoginResult.OtherData otherData = t.getData().getOtherData();
                            String tenantAdnm = otherData.getTenantAdnm();
                            List<String> adnmList = otherData.getAdnmList();
                            if (tenantAdnm != null && adnmList != null && !adnmList.isEmpty()) {
                                addressName = tenantAdnm + adnmList.get(0);
                            }
                            List<String> adcdList = otherData.getAdnmList();
                            if (adcdList != null && !adcdList.isEmpty()) {
                                adcd = t.getData().getOtherData().getAdcdList().get(0);
                                arerNumber = t.getData().getOtherData().getAdcdList().get(0).substring(4);
                            }
                            adminId = t.getData().getUserId();
                            context.startActivity(new Intent(context, com.dayu.qiheonlinelibrary.activity.HomeActivity.class));
                            ((Activity) context).finish();
                        } else {
                            TipUtil.show((Activity) context, "登录失败，请重试");
                        }
                        List<String> adcdList = otherData.getAdnmList();
                        if (adcdList != null && !adcdList.isEmpty()) {
                            adcd = t.getData().getOtherData().getAdcdList().get(0);
                            arerNumber = t.getData().getOtherData().getAdcdList().get(0).substring(4);
                        }
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                    context.startActivity(new Intent(context, com.dayu.qiheonlinelibrary.activity.HomeActivity.class));
                    ((Activity) context).finish();

                } else {
                    ToastUtil.show(t.getMsg());
                }
@@ -132,13 +148,14 @@
    public void getPricePlanVo(Context context) {
        Map<String, Object> data = new HashMap<>();
        data.put("priceMethod", 2);

        ApiManager.getInstance().requestPost(context, "api/sjgg/water/waterPricePlan/pageWaterPricePlanVo", PricePlanResult.class, data, new SubscriberListener<BaseResponse<PricePlanResult>>() {
        ApiManager.getInstance().requestPostHideLoading(context, "water/waterPricePlan/pageWaterPricePlanVo", PricePlanResult.class, data, new SubscriberListener<BaseResponse<PricePlanResult>>() {
            @Override
            public void onNext(BaseResponse<PricePlanResult> t) {
                if (t.isSuccess()) {
                    planId = t.getData().getRecords().get(0).getPlanId();
                    electriclePriceStr = t.getData().getRecords().get(0).getElectricityPrice();
                    if (t.getData() != null) {
                        planId = t.getData().getRecords().get(0).getPlanId();
                        electriclePriceStr = t.getData().getRecords().get(0).getElectricityPrice();
                    }
                }
            }
        });