修改提示

app/src/main/java/com/kfzs/duanduan/fragment/AbsFgtMyMoney.java

@@ -15,6 +15,7 @@ import com.sheep.gamegroup.view.adapter.ArrayAdapter;
 import com.sheep.gamegroup.view.customview.RefreshLayout;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
 import java.util.List;
@@ -105,7 +106,7 @@ public abstract class AbsFgtMyMoney extends BaseFragment {
                     public void onNext(BaseMessage baseMessage) {
                         List<? extends ILog> newList = getDatas(baseMessage);
                         if(newList == null) {
-                            baseMessage.setMsg("服务器数据错误");
+                            baseMessage.setMsg(SheepApp.getInstance().getString(R.string.service_data_error));
                             onError(baseMessage);
                         } else {
                             ListUtil.addAll(list, newList);

app/src/main/java/com/kfzs/duanduan/fragment/FgtBorrowPlay.java

@@ -112,7 +112,7 @@ public class FgtBorrowPlay extends BaseCompatFragment{
     private void gotoUrl(BaseMessage baseMessage) {
         YinkerData yinkerData = baseMessage.getData(YinkerData.class);
         if(yinkerData == null || TextUtils.isEmpty(yinkerData.getEntry_page_url())){
-            G.showToast("服务器错误，请稍后重试");
+            G.showToast(R.string.service_data_error);
         } else {
             Intent intent = new Intent(getActivity(), ActGuideDeblocked.class);
             intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_URL, yinkerData.getEntry_page_url());

app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCardTaskList.java

@@ -55,7 +55,7 @@ public class FgtCreditCardTaskList extends BaseFragment {
                 try {
                     onItemClickTask(list.get(i));
                 } catch (Exception ignore) {
-                    G.showToast(R.string.service_error);
+                    G.showToast(R.string.unknown_error);
                 }
             }
         });

app/src/main/java/com/sheep/gamegroup/model/entity/BaseMessage.java

@@ -1,8 +1,12 @@
 package com.sheep.gamegroup.model.entity;
 
+import android.text.TextUtils;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -108,4 +112,8 @@ public class BaseMessage implements Serializable{
     public String toString() {
         return JSONObject.toJSONString(this);
     }
+
+    public String getErrorMsg(){
+        return TextUtils.isEmpty(msg) ? SheepApp.getInstance().getString(R.string.unknown_error) : msg;
+    }
 }

app/src/main/java/com/sheep/gamegroup/model/util/ExceptionHandle.java

@@ -71,7 +71,7 @@ public class ExceptionHandle {
             return ex;
         } else {
             ex = new ResponeThrowable(e, ERROR.UNKNOWN);
-            ex.message = "服务器错误";//未知错误
+            ex.message = "未知错误";//未知错误
             return ex;
         }
     }

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -12,6 +12,7 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.NetUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -77,7 +78,7 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
 //                        Jump2View.getInstance().goNotice(ActivityManager.getInstance().currentActivity(), title.toString(), throwable.message, 0);
 //                    }
                     baseMessage = new BaseMessage();
-                    baseMessage.setMsg("服务器错误");
+                    baseMessage.setMsg(SheepApp.getInstance().getString(R.string.unknown_error));
                 }else {
                     try {
                         baseMessage = JSONObject.parseObject(BaseMessageConverter.decrypt(throwable.message), BaseMessage.class);

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -686,7 +686,7 @@ public class Jump2View {
                         if(BuildConfig.DEBUG)
                             System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         if(action1 != null)
-                            action1.call(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                            action1.call(baseMessage.getErrorMsg());
                     }
                 });
     }
@@ -925,8 +925,7 @@ public class Jump2View {
                     public void onError(BaseMessage baseMessage) {
                         LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         if(action1 != null){
-                            String msg = TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg();
-                            msg = baseMessage.getCode() == 404 ? "404" : msg;
+                            String msg = baseMessage.getCode() == 404 ? "404" : baseMessage.getErrorMsg();
                             action1.call(msg);
                         }
                     }

app/src/main/java/com/sheep/gamegroup/view/activity/ActCreditCardTaskList.java

@@ -137,7 +137,7 @@ public class ActCreditCardTaskList extends AbsChooseImageActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        updateError(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                        updateError(baseMessage.getErrorMsg());
                     }
 
                     @Override

app/src/main/java/com/sheep/gamegroup/view/activity/ActCreditCardWeb.java

@@ -69,7 +69,7 @@ public class ActCreditCardWeb extends BaseCompatActivity {
                 .execute(new StringCallback() {
                     @Override
                     public void onError(Call call, Exception e, int id) {
-                        G.showToast( "服务器配置错误，请联系客服");
+                        G.showToast( R.string.service_data_error);
                     }
 
                     @Override

app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java

@@ -282,7 +282,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 case 10://信用卡
                     Ext ext;
                     if(taskEty == null) {
-                        G.showToast("服务器数据错误，请联系客服或者稍候重试");
+                        G.showToast(R.string.service_data_error);
                     } else if((ext = EntityUtils.getExtInfo(taskEty.getExt())) == null || TextUtils.isEmpty(ext.getUrl())){
                         Jump2View.getInstance().goTaskDetailView(activity,  taskEty.getId());
                     } else {

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -499,7 +499,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         case 10:
                             Ext ext;
                             if (taskEty == null || (ext = EntityUtils.getExtInfo(taskEty.getExt())) == null || TextUtils.isEmpty(ext.getUrl())) {
-                                G.showToast("服务器数据错误，请联系客服或者稍候重试");
+                                G.showToast(R.string.service_data_error);
                             } else {
                                 Jump2View.getInstance().goWeb(activity, ext.getUrl());
                             }
@@ -750,7 +750,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         hideProgress();
-                        G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                        G.showToast(baseMessage.getErrorMsg());
                     }
 
                     @Override

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAddQQAct.java

@@ -183,7 +183,7 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
                         public void onError(BaseMessage baseMessage) {
                             if (BuildConfig.DEBUG)
                                 System.out.println("baseMessage onError " + JSON.toJSONString(baseMessage));
-                            updateError(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                            updateError(baseMessage.getErrorMsg());
                         }
                     });
         } else {//第一次提交已经失败，第二次提交接口不一样。。。。。。

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailCreditCardAct.java

@@ -345,7 +345,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        updateError(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                        updateError(baseMessage.getErrorMsg());
                     }
 
                     @Override

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAgreement.java

@@ -118,7 +118,7 @@ public class DialogAgreement {
                                     @Override
                                     public void onError(BaseMessage baseMessage) {
                                         LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                                        action1.call(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                                        action1.call(baseMessage.getErrorMsg());
                                     }
                                 });
             }

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/G.java

@@ -75,7 +75,7 @@ public class G {
     }
     public static void showToast(BaseMessage baseMessage) {
         if(TextUtils.isEmpty(baseMessage.getMsg())){
-            G.showToast(R.string.service_error);
+            G.showToast(R.string.unknown_error);
         } else {
             G.showToast(baseMessage.getMsg() + (BuildConfig.DEBUG ? "[" + baseMessage.getCode() + "]" : ""));
         }

app/src/main/res/layout/act_my_money.xml

@@ -182,7 +182,7 @@
             <ImageView
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:src="@drawable/selector_tab_my_money1"/>
+                android:src="@drawable/selector_tab_my_money2"/>
             <TextView
                 android:id="@+id/my_money_withdraw_tv"
                 android:layout_width="0dp"

app/src/main/res/values/strings.xml

@@ -13,8 +13,7 @@
     <string name="no_bind_tel_notice_text">我们已将你的手机号与该帐号绑定，如有变更，请点击</string>
     <string name="coming_soon">敬请期待</string>
     <string name="loading_data">数据正在加载中，请稍候重试</string>
-    <string name="service_data_error">服务器数据错误，请稍候再试</string>
-    <string name="service_error">服务器错误，请稍候再试</string>
+    <string name="service_data_error">数据错误，请稍候再试</string>
     <string name="unknown_error">未知错误，请稍候再试</string>
     <string name="error_download_link">下载地址错误，请联系客服</string>
     <string name="error_package_link">包名错误，请联系客服</string>