raomeng 8 lat temu
rodzic
commit
a938381e1d

+ 2 - 1
app_modular/appworks/src/main/java/com/uas/appworks/activity/B2BBusinessMainActivity.java

@@ -202,7 +202,8 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 mSelectPosition = position;
                 Intent intent = new Intent();
                 String billState = mPublicInquiryBeans.get(position).getBillState();
-                if (Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(billState)) {
+                if (Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(billState)
+                        || Constants.FLAG.STATE_PUBLIC_INQUIRY_INVALID.equals(billState)) {
                     intent.setClass(mContext, PublicInquiryDetailActivity.class);
                     intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, mPublicInquiryBeans.get(position).getId());
                     intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, mPublicInquiryBeans.get(position).getBillState());

+ 2 - 1
app_modular/appworks/src/main/java/com/uas/appworks/fragment/B2BBusinessListFragment.java

@@ -151,7 +151,8 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                     case B2BBusinessListBean.PUBLIC_INQUIRY_LIST:
                         intent = new Intent();
                         String billState = data.get(position).getBillState();
-                        if (Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(billState)) {
+                        if (Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(billState)
+                                || Constants.FLAG.STATE_PUBLIC_INQUIRY_INVALID.equals(billState)) {
                             intent.setClass(mContext, PublicInquiryDetailActivity.class);
                             intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, mB2BBusinessListBeans.get(position).getId());
                             intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, mB2BBusinessListBeans.get(position).getBillState());

+ 13 - 0
app_modular/appworks/src/main/java/com/uas/appworks/model/WorkPlatModel.java

@@ -3,6 +3,7 @@ package com.uas.appworks.model;
 import android.content.Context;
 import android.content.res.Resources;
 import android.support.annotation.NonNull;
+import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -57,6 +58,18 @@ public class WorkPlatModel implements IWorkPlatModel {
             } else {
                 appBaseUrl = CommonUtil.getAppBaseUrl(BaseConfig.getContext());
             }
+            if (TextUtils.isEmpty(appBaseUrl)) {
+                if (workCallback != null) {
+                    try {
+                        workCallback.onFail(what, context.getString(R.string.host_null_please_login_retry));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    ToastUtil.showToast(context, R.string.host_null_please_login_retry);
+                }
+                return;
+            }
             HttpRequest.getInstance().sendRequest(appBaseUrl, httpParams, workCallback);
         }
 

+ 1 - 0
app_modular/appworks/src/main/res/values-en/strings.xml

@@ -178,4 +178,5 @@
     <string name="str_share_cancel">分享取消</string>
     <string name="apply_hava_send">申请已发送</string>
     <string name="caption_invite_name">邀请人:</string>
+    <string name="host_null_please_login_retry">站点地址获取失败,请重新登录后重试</string>
 </resources>

+ 1 - 0
app_modular/appworks/src/main/res/values-zh-rCN/strings.xml

@@ -177,4 +177,5 @@
     <string name="str_share_cancel">分享取消</string>
     <string name="apply_hava_send">申请已发送</string>
     <string name="caption_invite_name">邀请人:</string>
+    <string name="host_null_please_login_retry">站点地址获取失败,请重新登录后重试</string>
 </resources>

+ 1 - 0
app_modular/appworks/src/main/res/values-zh-rTW/strings.xml

@@ -177,4 +177,5 @@
     <string name="str_share_cancel">分享取消</string>
     <string name="apply_hava_send">申请已发送</string>
     <string name="caption_invite_name">邀请人:</string>
+    <string name="host_null_please_login_retry">站点地址获取失败,请重新登录后重试</string>
 </resources>

+ 1 - 0
app_modular/appworks/src/main/res/values/strings.xml

@@ -210,6 +210,7 @@
     <string name="str_share_cancel">分享取消</string>
     <string name="apply_hava_send">申请已发送</string>
     <string name="caption_invite_name">邀请人:</string>
+    <string name="host_null_please_login_retry">站点地址获取失败,请重新登录后重试</string>
 
 
 </resources>