詹子聪 5 лет назад
Родитель
Сommit
516f0fa2f9

+ 18 - 3
app/src/main/java/com/miekir/eden/constant/EdenError.java

@@ -12,15 +12,30 @@ import com.miekir.network.constant.Code;
  * Description: 错误码
  */
 public class EdenError extends Code {
-    private EdenError() {
-    }
+    public static final int SUCCESS = 0;
+    public static final int FAILED_COMMON = -1;
+
+    /**
+     * 用户已存在
+     */
+    public static final int FAILED_USER_ALREADY_EXIST = -2;
+    /**
+     * 用户不存在
+     */
+    public static final int FAILED_USER_NOT_EXIST = -3;
+    public static final int REST_TIME = -4;
+    public static final int PERMISSION_DENIED = -5;
+
+    public static final int FAILED_NEED_RE_LOGIN = -99;
+    private EdenError() {}
 
-    public static final int PERMISSION_DENIED = -2;
 
     public static String getString(int code) {
         switch (code) {
             case PERMISSION_DENIED:
                 return StringTool.getString(R.string.response_permission_denied);
+            case REST_TIME:
+                return StringTool.getString(R.string.err_rest_time);
             default:
                 return "";
         }

+ 1 - 1
app/src/main/java/com/miekir/eden/ui/home/coupon/TemplatePresenter.java

@@ -38,7 +38,7 @@ public class TemplatePresenter extends BasePresenter<ITemplateView<String>> {
                     @Override
                     public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
-                            getView().onTemplateDataCome(false, EdenError.COMMON, null);
+                            getView().onTemplateDataCome(false, code, null);
                         }
                     }
                 });

+ 7 - 0
app/src/main/java/com/miekir/eden/ui/home/goods/GoodsFragment.java

@@ -1,5 +1,6 @@
 package com.miekir.eden.ui.home.goods;
 
+import android.text.TextUtils;
 import android.util.TypedValue;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -11,6 +12,7 @@ import com.miekir.common.utils.ToastTool;
 import com.miekir.eden.R;
 import com.miekir.eden.base.BaseBeiActivity;
 import com.miekir.eden.base.ITopActionListener;
+import com.miekir.eden.constant.EdenError;
 import com.miekir.eden.tool.StringTool;
 import com.miekir.eden.widget.bottomlistener.OnRcvScrollListener;
 import com.miekir.eden.widget.decoration.SpacesItemDecoration;
@@ -139,6 +141,11 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
     public void onGoodsDataCome(boolean success, int code, List<GoodsBean> goodsList) {
         srl_goods.setRefreshing(false);
         if (!success) {
+            String toast = EdenError.getString(code);
+            if (!TextUtils.isEmpty(toast)) {
+                ToastTool.showShort(toast);
+                return;
+            }
             ToastTool.showShort(StringTool.getString(R.string.data_get_fail));
             return;
         }

+ 1 - 1
app/src/main/java/com/miekir/eden/ui/home/goods/GoodsPresenter.java

@@ -36,7 +36,7 @@ public class GoodsPresenter extends BasePresenter<IGoodsView> {
                     @Override
                     public void onFailure(int code, Throwable e, String errMsg) {
                         if (getView() != null) {
-                            getView().onGoodsDataCome(false, EdenError.COMMON, null);
+                            getView().onGoodsDataCome(false, code, null);
                         }
                     }
                 });

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

@@ -99,4 +99,5 @@
     <string name="mine_ali_go">Ali Go</string>
     <string name="mine_confirm_aligo">确定执行此不可逆转的操作?</string>
     <string name="ad_title">请领取美食优惠券后继续</string>
+    <string name="err_rest_time">休息时间到</string>
 </resources>

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

@@ -99,4 +99,5 @@
     <string name="mine_ali_go">Ali Go</string>
     <string name="mine_confirm_aligo">Sure to proceed?</string>
     <string name="ad_title">Please go and get your coupon first</string>
+    <string name="err_rest_time">Rest time now</string>
 </resources>