Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

# Conflicts:
#	app/src/main/java/com/sheep/gamegroup/model/entity/UserEntity.java
#	app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java
#	app/src/main/res/layout/fgt_personacenter_item_top.xml
#	app/src/main/res/layout/try_makemoney_item_recommend.xml
#	app/src/main/res/values/strings.xml

app/build.gradle

@@ -24,7 +24,7 @@ android {
         flavorDimensions "versionCode"
     }
     greendao {
-        schemaVersion 15
+        schemaVersion 16
         targetGenDir 'src/main/java'
     }
     signingConfigs {

app/src/main/AndroidManifest.xml

@@ -396,9 +396,6 @@
             android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.sheep.gamegroup.view.activity.ActWeb"
-            android:screenOrientation="portrait" />
-        <activity
             android:name="com.sheep.gamegroup.view.activity.ActWebX5"
             android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />

app/src/main/java/com/sheep/gamegroup/helper/TaskHelper.java

@@ -231,12 +231,12 @@ public class TaskHelper {
                                             }
                                         }).start();
                             }
-                            find_information_game_task.setText("取消任务");
+                            find_information_game_task.setText(find_information_game_task.getContext().getString(R.string.cancel));
                             find_information_game_task.setEnabled(true);
                             find_information_game_task.setOnClickListener(new View.OnClickListener() {
                                 @Override
                                 public void onClick(View view) {
-                                    FIND_TASK.onEvent("release_task_id", release_task_id, "action", "取消任务");
+                                    FIND_TASK.onEvent("release_task_id", release_task_id, "action", view.getContext().getString(R.string.cancel));
                                     SheepApp.getInstance().getNetComponent().getApiService().giveUpTask(taskAcceptedEty.getId())
                                             .subscribeOn(Schedulers.io())
                                             .observeOn(AndroidSchedulers.mainThread())
@@ -299,12 +299,12 @@ public class TaskHelper {
                 } else if ("0".equals(taskReleaseEty.getLast_num())) {
                     find_information_game_task_end_time.setVisibility(View.GONE);
                     find_information_game_task.setVisibility(View.VISIBLE);
-                    find_information_game_task.setText("任务已抢光");
+                    find_information_game_task.setText(find_information_game_task.getContext().getString(R.string.task_taken_all));
                     find_information_game_task.setEnabled(false);
                 } else {
                     find_information_game_task_end_time.setVisibility(View.GONE);
                     find_information_game_task.setVisibility(View.VISIBLE);
-                    find_information_game_task.setText("领取任务");
+                    find_information_game_task.setText(find_information_game_task.getContext().getString(R.string.get_task));
                     find_information_game_task.setEnabled(true);
                     find_information_game_task.setOnClickListener(new View.OnClickListener() {
                         @Override
@@ -315,7 +315,7 @@ public class TaskHelper {
                             taskEty.setAcceptedTaskId(taskReleaseEty.getAccepted_task_id());
                             Jump2View.getInstance().goTaskDetailView(activity, release_task_id);
 //                            Jump2View.getInstance().goDialogActivityView(activity, taskEty);
-                            FIND_TASK.onEvent("release_task_id", release_task_id, "action", "领取任务");
+                            FIND_TASK.onEvent("release_task_id", release_task_id, "action", view.getContext().getString(R.string.get_task));
                         }
                     });
                 }
@@ -357,6 +357,7 @@ public class TaskHelper {
         timer = null;
         action1 = null;
     }
+
     /**
      * 退出
      */
@@ -430,11 +431,11 @@ public class TaskHelper {
             case TASK_TYPE_GAME_SHEEP:
             case TASK_TYPE_GAME_TECENT:
             case TASK_TYPE_GAME_XIAO_MI:
-                return new String[]{"游戏任务", "#4889FF"};//已经修改为一种颜色了
+                return new String[]{SheepApp.getInstance().getResources().getString(R.string.game_task), "#4889FF"};//已经修改为一种颜色了
             case TASK_TYPE_SUCCESSION:
-                return new String[]{"连续任务", "#4889FF"};
+                return new String[]{SheepApp.getInstance().getResources().getString(R.string.continuity_task), "#4889FF"};
             default:
-                return new String[]{"试玩任务", "#4889FF"};
+                return new String[]{SheepApp.getInstance().getResources().getString(R.string.try_task), "#4889FF"};
         }
     }
 

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

@@ -3,6 +3,8 @@ package com.sheep.gamegroup.util;
 import android.text.TextUtils;
 
 import com.sheep.gamegroup.model.entity.CreditCardProgressQuery;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 /**
  * Created by realicing on 2018/4/27.
@@ -27,7 +29,7 @@ public class BtStatusUtil {
             case 7:
                 return "正在审核";
             case 8:
-                return "任务已下线";
+                return SheepApp.getInstance().getResources().getString(R.string.task_offline);
         }
         return "上传截图";
     }

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

@@ -129,8 +129,6 @@ public class CommonUtil {
     public static final int MIN_CLICK_DELAY_TIME = 1000;
     private long lastClickTime = 0;
 
-    public static String START_TASK = "开始任务";
-    public static String GET_TASK = "领取任务";
     public static String START_PLAY = "开始试玩";
     public static String CONTINUE_DOWNLOAD = "继续下载";
     public static String START_DOWNLOAD = "开始下载";
@@ -142,7 +140,6 @@ public class CommonUtil {
     public static String GAME_INSTALL = "安装游戏";
     public static String GAME_OPEN = "开始试玩";
     public static String GAME_RESERVATION = "预约游戏";
-    public static String TASK_OFFLINE = "任务已下线";
     public static final String TASK_AUDIT = "audit";
     private static CommonUtil commonUtil;
 
@@ -297,7 +294,7 @@ public class CommonUtil {
      * 若00:00:00后任务未完成，视为自动放弃，您可重新接受
      */
     public String assemblyString(String date) {
-        String str = "若<font color='#ff2d4b'><small>" + date + "</small></font>后任务未完成，视为自动放弃，您可重新接受";
+        String str = "若<font color='#ff2d4b'><small>" + date + "</small></font>后奖励未完成，视为自动放弃，您可重新接受";
         return str;
     }
 
@@ -486,7 +483,7 @@ public class CommonUtil {
                 Jump2View.getInstance().goRechargeQAct(context, from);
                 break;
             case JUMP_WX_ASSIST://微信辅助
-                Jump2View.getInstance().goWeb(context, jump.getUrl(), "微信二维码辅助好友注册任务");
+                Jump2View.getInstance().goWeb(context, jump.getUrl(), "微信二维码辅助好友注册");
                 break;
             case JUMP_SUCCESSION_TASK://连续任务
                 Jump2View.getInstance().goSequentialTaskView(context);
@@ -1375,7 +1372,7 @@ public class CommonUtil {
 
     public void tryGiveUpTask(final Context context, final Release_task taskReleaseEty, final Action1<Integer> action1) {
         ViewUtil.showMsgDialog(context, new DialogConfig().setTitle("提示")
-                .setMsg("是否放弃正在运行中的任务").setBtnRightText("否")
+                .setMsg(context.getString(R.string.give_up_doing_task_or_not)).setBtnRightText("否")
                 .setBtnLeftText("是").setBtnLeftOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
@@ -2204,7 +2201,7 @@ public class CommonUtil {
                     G.showToast(R.string.error_data);
                     return;
                 }
-                Jump2View.getInstance().goWeb(activity, ext.getUrl(), "微信二维码辅助好友注册任务");
+                Jump2View.getInstance().goWeb(activity, ext.getUrl(), "微信二维码辅助好友注册");
 
                 break;
             case 6://连续任务

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

@@ -573,7 +573,7 @@ public class Jump2View {
                         if (context instanceof BaseActivity) {
                             ((BaseActivity) context).hideProgress();
                         }
-                        Jump2View.getInstance().goWeb(context, baseMessage.getData().toString(), "微信二维码辅助好友注册任务");
+                        Jump2View.getInstance().goWeb(context, baseMessage.getData().toString(), "微信二维码辅助好友注册");
                     }
 
                     @Override
@@ -1402,7 +1402,7 @@ public class Jump2View {
                                 DialogNewbieTask1.showDialog(activity, taskList, task);
                             } else {
                                 if (BuildConfig.DEBUG)
-                                    G.showToast("测试：服务器数据错误,新手任务数据为空");
+                                    G.showToast("测试：服务器数据错误,新手奖励数据为空");
                             }
                         }
 

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

@@ -43,12 +43,12 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.plugin.util.SheepPluginUtil;
 import com.sheep.gamegroup.usage.AppUsageManager;
+import com.sheep.gamegroup.util.js.BaseActWeb;
 import com.sheep.gamegroup.view.activity.ActInstallApkList;
 import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.ActSheepApkList;
 import com.sheep.gamegroup.view.activity.ActSheepPngList;
 import com.sheep.gamegroup.view.activity.ActTestExpression;
-import com.sheep.gamegroup.view.activity.ActWeb;
 import com.sheep.gamegroup.view.activity.NotificationsUtils;
 import com.sheep.gamegroup.view.dialog.DialogGameOrTaskOrGift;
 import com.sheep.gamegroup.view.dialog.DialogLoading;
@@ -702,7 +702,7 @@ public class TestUtil {
         CommonUtil.getInstance().initUrlConfigByNet(name, new Action1<String>() {
             @Override
             public void call(String url) {
-                StringUtils.CopyText(ActWeb.addUrlToken(url));
+                StringUtils.CopyText(BaseActWeb.addUrlToken(url));
             }
         });
     }

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

@@ -343,7 +343,7 @@ public class ViewUtil {
                     } catch (Exception e) {
                     }
                 } else {
-                    G.showToast("任务已被抢光！请实时关注任务发布！");
+                    G.showToast(ivIcon.getContext().getString(R.string.task_sold_out_focus_publish));
                 }
             }
         });
@@ -404,7 +404,7 @@ public class ViewUtil {
             public void onClick(View v) {
                 mAlertDialog.dismiss();
                 if (mRobTask == null) {
-                    G.showToast("抢任务失败！");
+                    G.showToast(mActivity.getString(R.string.rob_task_failed));
                     return;
                 }
                 Intent intent = new Intent(mActivity, TaskDetailAct.class);

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

@@ -56,12 +56,12 @@ public class ActCreditCardTaskList extends AbsChooseImageActivity {
                     @Override
                     public void onClick(View view) {
                         ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("温馨提示").setBtnLeftText("我知道了")
-                                .setMsg("该栏目为现金任务，参与好友提成。"));
+                                .setMsg(getString(R.string.cash_task_and_share_friend_benefit)));
                     }
                 });
 
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
-        mAdapter.add(new FgtCreditCardTaskList(), "任务列表");
+        mAdapter.add(new FgtCreditCardTaskList(), getString(R.string.task_list));
         mAdapter.add(new FgtCreditCardProgressQuery(), "进度查询");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);

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

@@ -63,7 +63,7 @@ public class ActMiDong extends BaseActivity {
                     @Override
                     public void onClick(View view) {
                         ViewUtil.showMsgDialog(ActMiDong.this, new DialogConfig().setTitle("温馨提示").setBtnLeftText("我知道了")
-                                .setMsg("该栏目为现金任务，不参与好友提成。"));
+                                .setMsg(getString(R.string.cash_task_without_share_friend_benefit)));
                     }
                 });
     }

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

@@ -47,7 +47,7 @@ public class ActNewbieTaskList extends BaseActivity {
     public void initView() {
         activity = this;
         TitleBarUtils.getInstance()
-                .setTitle(this, "任务中心")
+                .setTitle(this, getString(R.string.task_center))
                 .setTitleFinish(this);
         swipe_container.setFooterView(this, withdrawalListview, R.layout.listview_footer);
         adp = new NewbieTaskAdp(activity, etyList);

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

@@ -111,7 +111,7 @@ public class ActSearchApp extends BaseActivity {
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
                 .setTitleFinish(this)
-                .setSearchBox(this, "搜索任务名称/游戏名称",
+                .setSearchBox(this, getString(R.string.search_task_or_game_name),
                         (v, actionId, event) -> {
                             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                                 toSearchApp();

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

@@ -91,7 +91,7 @@ public class ActSearchAppOrTask extends BaseActivity {
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
                 .setTitleFinish(this)
-                .setSearchBox(this, "搜索任务名称/游戏名称",
+                .setSearchBox(this, getString(R.string.search_task_or_game_name),
                         (v, actionId, event) -> {
                             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                                 toSearchApp();

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

@@ -5,7 +5,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.Gravity;
 import android.view.View;
@@ -321,22 +320,22 @@ public class ActSignCard extends BaseActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.sign_card_join:
-                参加打卡挑战();
+                joinChallenge();
                 break;
             case R.id.sign_card_tip:
-                显示活动说明();
+                showTaskDescription();
                 break;
             case R.id.sign_card_look_more:
-                查看详细榜单();
+                showRankDetail();
                 break;
         }
     }
 
-    private void 查看详细榜单() {
+    private void showRankDetail() {
         Jump2View.getInstance().goSignRankingsAct(activity, null);
     }
 
-    private void 显示活动说明() {
+    private void showTaskDescription() {
         ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("早起也能赚钱了").setBtnLeftText("我知道了")
                 .setMsgGravity(Gravity.START).setMsg("1、支付1元作为早起动力金参与早起打卡，放入早起打卡挑战奖池内。\n" +
                         "2、次日早上7:00-9:00时段为早起打卡时间，用户在此期间进入小绵羊点击打卡按钮则成功打卡成功打卡不仅能拿回您原来投入的1元动力金，还能瓜分当天所有打卡失败者的全部动力金。\n" +
@@ -345,17 +344,17 @@ public class ActSignCard extends BaseActivity {
                         "本活动最终解释权归橙风有量科技有限公司所有"));
     }
 
-    private void 参加打卡挑战() {
+    private void joinChallenge() {
         if (punchType == PUNCH_TYPE_CAN_PUNCH) {//可以打卡
-            参加打卡();
+            joinCheckIn();
         } else if (initCanSignUp == SUCCESS && isCanSignUp) {//可以报名
-            参加报名();
+            joinSignUp();
         } else {
             ViewUtil.showMsgDialog(activity, "活动暂未开始，请于早上7点至9点来参与打卡");
         }
     }
 
-    private void 参加打卡() {
+    private void joinCheckIn() {
         UMConfigUtils.Event.PUNCH_PUNCH.onEvent();
         SheepApp.getInstance().getNetComponent().getApiService().getPunch()
                 .subscribeOn(Schedulers.io())
@@ -387,7 +386,7 @@ public class ActSignCard extends BaseActivity {
                 });
     }
 
-    private void 参加报名() {
+    private void joinSignUp() {
         UMConfigUtils.Event.PUNCH_SIGN_UP.onEvent();
         CommonUtil.getInstance().callActionWithUserInfo(new Action1<UserEntity>() {
             @Override
@@ -406,7 +405,7 @@ public class ActSignCard extends BaseActivity {
                                                         @Override
                                                         public void onClick(View view) {
                                                             //跳转到系统闹钟
-                                                            SysAppUtil.startAlermApp(activity, "小绵羊打卡任务", 7, 5);
+                                                            SysAppUtil.startAlermApp(activity, getString(R.string.smallsheep_checkin_task), 7, 5);
                                                         }
                                                     }));
                                             isCanSignUp = false;

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

@@ -1,474 +0,0 @@
-package com.sheep.gamegroup.view.activity;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.provider.MediaStore;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.text.TextUtils;
-import android.view.View;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import com.sheep.gamegroup.absBase.IJumpWeb;
-import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.gamegroup.util.TestUtil;
-import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.util.js.BaseActWeb;
-import com.sheep.gamegroup.util.js.KFZSJs;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.yalantis.ucrop.util.FileUtils;
-import com.zhy.http.okhttp.OkHttpUtils;
-import com.zhy.http.okhttp.callback.StringCallback;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import butterknife.BindView;
-import okhttp3.Call;
-
-
-/**
- * web页面--含有所有js及url后添加authorization
- * Created by zengjiebin on 2018/4/27.
- */
-public class ActWeb extends BaseActWeb {
-
-    @BindView(R.id.webview)
-    WebView mWebView;
-
-    private String title;//title为空时，不显示整个标题栏
-    private boolean needJsInteract;//是否需要js交互,有js交互的会对url进行操作：拼接token到后面
-    private WebSettings webViewSettings;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.act_web;
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
-    @Override
-    public void initView() {
-        Intent intent = getIntent();
-        String url = intent.getStringExtra(IJumpWeb.KEY_URL);
-        title = intent.getStringExtra(IJumpWeb.KEY_TITLE);//title为空时，不显示整个标题栏
-        needJsInteract = intent.getBooleanExtra(IJumpWeb.KEY_NEEDJSINTERACT, false);
-        String jsUrl = intent.getStringExtra(IJumpWeb.KEY_JSURL);
-        if (!TextUtils.isEmpty(url)) {
-            url = url.trim();
-        }
-        TitleBarUtils
-                .getInstance()
-                .setTitle(this, TextUtils.isEmpty(title) ? "加载中" : title)
-                .setTitleFinish(this);
-        initWebViewSettings(mWebView);
-        webViewSettings = mWebView.getSettings();
-        webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
-        try {
-            if (TestUtil.isTest())
-                WebView.setWebContentsDebuggingEnabled(true);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
-        }
-        if (TextUtils.isEmpty(jsUrl)) {
-            loadUrl(url);
-        } else {
-            initJsData(url, jsUrl);
-        }
-    }
-
-    //初始化js代码数据
-    private void initJsData(final String url, String jsUrl) {
-        OkHttpUtils.get()
-                .url(jsUrl)
-                .build()
-                .execute(new StringCallback() {
-                    @Override
-                    public void onError(Call call, Exception e, int id) {
-                        G.showToast(R.string.service_data_error);
-                    }
-
-                    @Override
-                    public void onResponse(String response, int id) {
-                        js = response;
-                        loadUrl(url);
-                    }
-                });
-    }
-
-    @Override
-    public void initListener() {
-        CommonUtil.getInstance().setDownloadListener(this, mWebView);
-    }
-
-    public static void initWebViewSettings(WebView webView) {
-        webView.setClickable(true);
-        WebSettings webSetting = webView.getSettings();
-        webSetting.setJavaScriptEnabled(true);
-        webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
-        webSetting.setAllowFileAccess(true);
-        webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
-//        webSetting.setSupportZoom(true);
-//        webSetting.setBuiltInZoomControls(true);
-        webSetting.setUseWideViewPort(true);
-        webSetting.setSupportMultipleWindows(true);
-        // webSetting.setLoadWithOverviewMode(true);
-        webSetting.setAppCacheEnabled(true);
-        // webSetting.setDatabaseEnabled(true);
-        webSetting.setDomStorageEnabled(true);
-        webSetting.setGeolocationEnabled(true);
-        webSetting.setAppCacheMaxSize(Long.MAX_VALUE);
-        // webSetting.setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);
-        webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
-        // webSetting.setRenderPriority(WebSettings.RenderPriority.HIGH);
-        webSetting.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
-
-        // this.getSettingsExtension().setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);//extension
-        // settings 的设计
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (mWebView != null) {
-            mWebView.setVisibility(View.GONE);
-            mWebView.removeAllViews();
-            mWebView.destroy();
-        }
-    }
-
-    /**
-     *
-     */
-    public static final int INPUT_FILE_REQUEST_CODE = 1;
-    private ValueCallback<Uri> mUploadMessage;
-    private final static int FILECHOOSER_RESULTCODE = 2;
-    private ValueCallback<Uri[]> mFilePathCallback;
-
-    private String mCameraPhotoPath;
-
-    private void loadUrl(final String url) {
-
-        mWebView.setWebChromeClient(new WebChromeClient() {
-            @Override
-            public void onReceivedTitle(WebView view, String title) {
-                super.onReceivedTitle(view, title);
-                if (ActWeb.this.title == null)
-                    TitleBarUtils
-                            .getInstance()
-                            .setTitle(ActWeb.this, title);
-            }
-
-            @Override
-            public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
-                if (mFilePathCallback != null) {
-                    mFilePathCallback.onReceiveValue(null);
-                }
-                mFilePathCallback = filePathCallback;
-
-                /*PhotoPicker.builder()
-                        .setPhotoCount(1)
-                        .setShowCamera(true)
-                        .setShowGif(false)
-                        .setPreviewEnabled(true)
-                        .start(ActWeb.this, PhotoPicker.REQUEST_CODE);*/
-                Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-                if (takePictureIntent.resolveActivity(getPackageManager()) != null) {
-                    // Create the File where the photo should go
-                    File photoFile;
-                    photoFile = createImageFile();
-                    takePictureIntent.putExtra("PhotoPath", mCameraPhotoPath);
-
-                    // Continue only if the File was successfully created
-                    if (photoFile != null) {
-                        mCameraPhotoPath = "file:" + photoFile.getAbsolutePath();
-                        takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT,
-                                Uri.fromFile(photoFile));
-                    } else {
-                    }
-                }
-
-                Intent contentSelectionIntent = new Intent(Intent.ACTION_GET_CONTENT);
-                contentSelectionIntent.addCategory(Intent.CATEGORY_OPENABLE);
-                contentSelectionIntent.setType("image/*");
-
-                Intent[] intentArray;
-                takePictureIntent = null;//步调用相机
-                if (takePictureIntent != null) {
-                    intentArray = new Intent[]{takePictureIntent};
-                } else {
-                    intentArray = new Intent[0];
-                }
-
-                Intent chooserIntent = new Intent(Intent.ACTION_CHOOSER);
-                chooserIntent.putExtra(Intent.EXTRA_INTENT, contentSelectionIntent);
-                chooserIntent.putExtra(Intent.EXTRA_TITLE, "图片选择");
-                chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, intentArray);
-
-                startActivityForResult(chooserIntent, INPUT_FILE_REQUEST_CODE);
-
-                return /*super.onShowFileChooser(webView, filePathCallback, fileChooserParams)*/true;
-            }
-
-            //For Android 4.1
-            public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, String capture) {
-                mUploadMessage = uploadMsg;
-                Intent i = new Intent(Intent.ACTION_GET_CONTENT);
-                i.addCategory(Intent.CATEGORY_OPENABLE);
-                i.setType("image/*");
-                ActWeb.this.startActivityForResult(Intent.createChooser(i, "Image Chooser"), FILECHOOSER_RESULTCODE);
-
-            }
-
-            @Override
-            public void onProgressChanged(WebView view, int newProgress) {
-                if (newProgress == 100) {
-                    String action = "javascript:imgsrc('" + url + "')";
-                    runWebviewUrl(action);
-                }
-                super.onProgressChanged(view, newProgress);
-            }
-        });
-        mWebView.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                LogUtil.println("ActWeb", "shouldOverrideUrlLoading", url);
-                //微信H5支付核心代码
-                if (url.startsWith("weixin://wap/pay?")) {
-                    try {
-                        Intent intent = new Intent();
-                        intent.setAction(Intent.ACTION_VIEW);
-                        intent.setData(Uri.parse(url));
-                        startActivity(intent);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    return true;
-                } else if (url.startsWith("alipays:") || url.startsWith("alipay")) {
-                    try {
-                        startActivity(new Intent("android.intent.action.VIEW", Uri.parse(url)));
-                    } catch (Exception e) {
-                        new AlertDialog.Builder(ActWeb.this)
-                                .setMessage("未检测到支付宝客户端，请安装后重试。")
-                                .setPositiveButton("立即安装", new DialogInterface.OnClickListener() {
-
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        Uri alipayUrl = Uri.parse("https://d.alipay.com");
-                                        startActivity(new Intent("android.intent.action.VIEW", alipayUrl));
-                                    }
-                                }).setNegativeButton("取消", null).show();
-                    }
-                    return true;
-                } else if (url.contains("17xmy.com")) {
-                    Map<String, String> extraHeaders = new HashMap<>();
-                    extraHeaders.put("Referer", "http://17xmy.com");
-                    view.loadUrl(url, extraHeaders);
-                    return true;
-                } else if (url.contains("kfzs.com") || (url.startsWith("http://10.8.") && TestUtil.isDev())) {
-                    Map<String, String> extraHeaders = new HashMap<>();
-                    extraHeaders.put("Referer", "http://kfzs.com");
-                    view.loadUrl(url, extraHeaders);
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-
-            @Override
-            public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                LogUtil.println("ActWeb", "onPageStarted", url);
-                super.onPageStarted(view, url, favicon);
-            }
-
-            @Override
-            public void onPageFinished(WebView view, String url) {
-                LogUtil.println("ActWeb", "onPageFinished", url);
-                super.onPageFinished(view, url);
-                imgReset();
-                loadJs();
-            }
-        });
-        webViewSettings.setJavaScriptEnabled(true);
-        if (needJsInteract) {
-            mWebView.addJavascriptInterface(new KFZSJs(this), "kfzsjs");
-            String loadUrl = addUrlToken(url);
-            LogUtil.println("ActWeb loadUrl = " + loadUrl);
-            if (CommonUtil.getInstance().judgeUrlPicture(url)) {
-                runWebviewUrl("file:///android_asset/loadImg.html");
-            } else {
-                mWebView.loadUrl(loadUrl);
-            }
-        } else {
-            if (CommonUtil.getInstance().judgeUrlPicture(url)) {
-                runWebviewUrl("file:///android_asset/loadImg.html");
-            } else {
-                mWebView.loadUrl(url);
-            }
-        }
-    }
-
-    //在sdcard卡创建缩略图
-    //createImageFileInSdcard
-    @SuppressLint("SdCardPath")
-    private File createImageFile() {
-        //mCameraPhotoPath="/mnt/sdcard/tmp.png";
-        File file = new File(Environment.getExternalStorageDirectory() + "/", "tmp.png");
-        mCameraPhotoPath = file.getAbsolutePath();
-        if (!file.exists()) {
-            try {
-                file.createNewFile();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return file;
-    }
-
-    /**
-     * 是否响应返回键
-     */
-    private boolean responseBack = true;
-
-    @Override
-    public void onBackPressed() {
-        if (responseBack)
-            super.onBackPressed();
-        else {
-            loadJs("onBackPressed()");
-        }
-    }
-
-    @Override
-    public void loadJs(String js) {
-        ViewUtil.loadJs(mWebView, js);
-    }
-
-    @Override
-    public void finish() {
-        if (mWebView != null && mWebView.canGoBack()) {
-            mWebView.goBack();
-            return;
-        }
-        super.finish();
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == FILECHOOSER_RESULTCODE) {
-            if (null == mUploadMessage) return;
-            Uri result = data == null || resultCode != RESULT_OK ? null
-                    : data.getData();
-            if (result != null) {
-                String imagePath = FileUtils.getPath(this, result);
-                if (!TextUtils.isEmpty(imagePath)) {
-                    result = Uri.parse("file:///" + imagePath);
-                }
-            }
-            mUploadMessage.onReceiveValue(result);
-            mUploadMessage = null;
-        } else if (requestCode == INPUT_FILE_REQUEST_CODE && mFilePathCallback != null) {
-            // 5.0的回调
-            Uri[] results = null;
-
-            // Check that the response is a good one
-            if (resultCode == Activity.RESULT_OK) {
-                if (data == null) {
-                    // If there is not data, then we may have taken a photo
-                    if (mCameraPhotoPath != null) {
-                        results = new Uri[]{Uri.parse(mCameraPhotoPath)};
-                    }
-                } else {
-                    String dataString = data.getDataString();
-                    if (dataString != null) {
-                        results = new Uri[]{Uri.parse(dataString)};
-                    }
-                }
-            }
-
-            mFilePathCallback.onReceiveValue(results);
-            mFilePathCallback = null;
-        } else {
-            super.onActivityResult(requestCode, resultCode, data);
-            return;
-        }
-    }
-
-    private void imgReset() {
-        ViewUtil.loadJs(mWebView, "(function(){" +
-                "var objs = document.getElementsByTagName('img'); " +
-                "for(var i=0;i<objs.length;i++)  " +
-                "{"
-                + "var img = objs[i];   " +
-                " img.style.maxWidth = '100%';" +
-                "}" +
-                "})()");
-    }
-
-    private void runWebviewUrl(final String url) {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                if (mWebView != null && !TextUtils.isEmpty(url)) {
-                    mWebView.loadUrl(url);
-                }
-            }
-        });
-    }
-
-    // 注入js函数监听
-    public void loadJs() {
-        if (TextUtils.isEmpty(js))
-            return;
-        ViewUtil.loadJs(mWebView, getJs());
-        LogUtil.println("ActWeb", "loadJs", js);
-    }
-
-    private String js;
-
-    private String getJs() {
-        String testJsStart = "alert('成功注入');";
-        return BuildConfig.DEBUG ? testJsStart + "\n" + js : js;
-    }
-
-    @Override
-    public boolean isResponseBack() {
-        return responseBack;
-    }
-
-    @Override
-    public void setResponseBack(boolean responseBack) {
-        this.responseBack = responseBack;
-    }
-
-    @Override
-    public void clearWebView() {
-        mWebView = null;
-    }
-
-    @Override
-    public void showTitleBar(boolean isShow) {
-        ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-            actionBar.hide();
-    }
-}

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

@@ -73,7 +73,7 @@ public class ActXianWanWeb extends BaseActivity {
                     @Override
                     public void onClick(View view) {
                         ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("温馨提示").setBtnLeftText("我知道了")
-                                .setMsg("该栏目为现金任务，不参与好友提成。"));
+                                .setMsg(getString(R.string.cash_task_without_share_friend_benefit)));
                     }
                 });
         tv_next.setVisibility(View.GONE);
@@ -127,7 +127,7 @@ public class ActXianWanWeb extends BaseActivity {
                 super.onReceivedTitle(view, title);
                 TitleBarUtils
                         .getInstance()
-                        .setTitle(activity, title.replaceAll("任务", "奖励"));
+                        .setTitle(activity, title);
             }
         });
         mWebView.setWebViewClient(new WebViewClient() {

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

@@ -41,14 +41,11 @@ public class GamemakeMoneyAct extends BaseActivity {
     private Activity activity;
 
     private AdpTryMakemoney mAdapter;
-    private String[] titles = new String[]{"推荐任务", "我的游戏"};
 
     private boolean clickFlag = false;
 
     private int is_succession;//0:一般任务 1:连续任务
 
-    private String title = "游戏任务";
-
     private int currentItem;
 
     @Override
@@ -68,7 +65,7 @@ public class GamemakeMoneyAct extends BaseActivity {
         TitleBarUtils
                 .getInstance()
                 .setShowOrHide(this, true)
-                .setTitle(activity, title)
+                .setTitle(activity, getString(R.string.game_task))
                 .setTitleFinish(activity)
                 .setRightSecondBtn(activity, R.mipmap.question_black_img, new View.OnClickListener() {
                     @Override
@@ -88,8 +85,8 @@ public class GamemakeMoneyAct extends BaseActivity {
                 });
 
         mAdapter = new AdpTryMakemoney(getSupportFragmentManager(), this);
-        mAdapter.add(FgtTryMakeMoney.newInstance(0), titles[0]);
-        mAdapter.add(FgtMyGame.newInstance(2), titles[1]);
+        mAdapter.add(FgtTryMakeMoney.newInstance(0), getString(R.string.recommend_task));
+        mAdapter.add(FgtMyGame.newInstance(2), getString(R.string.my_games));
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
 

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

@@ -161,7 +161,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
                         @Override
                         public void onClick(View view) {
                             //跳转到系统闹钟
-                            SysAppUtil.startAlermApp(activity, "小绵羊打卡任务", 7, 5);
+                            SysAppUtil.startAlermApp(activity, getString(R.string.smallsheep_checkin_task), 7, 5);
                         }
                     }));
             presenter.goPunchAndSignCount();//(刷新数据)获取可打卡和报名人数

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

@@ -415,7 +415,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
                     Jump2View.getInstance().goCreditCardTaskList(activity, null);
                     break;
                 case 6:
-                    Jump2View.getInstance().goWeb(activity, advertising.getLink(), "微信二维码辅助好友注册任务");
+                    Jump2View.getInstance().goWeb(activity, advertising.getLink(), "微信二维码辅助好友注册");
                     break;
                 case 7:
                     Jump2View.getInstance().goSequentialTaskView(activity);

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

@@ -114,7 +114,6 @@ import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_GAME_TECENT;
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_GAME_XIAO_MI;
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_H5;
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_SUCCESSION;
-import static com.sheep.gamegroup.util.CommonUtil.START_TASK;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_GET;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECEIVE_AWARD_GAME_TASK;
 
@@ -244,7 +243,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 .inject(this);
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
-                .setTitle(activity, "任务详情")
+                .setTitle(activity, getString(R.string.task_detail))
                 .setTitleFinish(activity);
         downloadUtil = new DownloadUtil();
         adpTaskDetailChildListview = new AdpTaskDetailChildListview(taskChildList, activity);
@@ -368,7 +367,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         //判断任务是否下线
         if (taskReleaseEty.isOffline()) {//任务已经下线
             if (gettaskAcceptedEty == null) {//无任务记录
-                btnUpImag.setText(CommonUtil.TASK_OFFLINE);//第二按钮不可点击且显示状态
+                btnUpImag.setText(R.string.task_offline);//第二按钮不可点击且显示状态
                 btnUpImag.setEnabled(false);
                 switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务 1004 小米游戏任务
                     case TASK_TYPE_H5://h5业务
@@ -384,7 +383,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                             case OPEN_MODE_TYPE_H5_OUT:
                             case OPEN_MODE_TYPE_H5_IN:
                                 type = TASK_TYPE_COMMON_H5 + taskEty.getOpen_mode();
-                                btnTaskItem.setText(START_TASK);
+                                btnTaskItem.setText(R.string.task_start);
                                 break;
                             case OPEN_MODE_TYPE_APP:
                             default:
@@ -402,7 +401,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         break;
                 }
             } else {//有任务记录
-                btnUpImag.setText(CommonUtil.TASK_OFFLINE);//第二按钮不可点击且显示状态
+                btnUpImag.setText(R.string.task_offline);//第二按钮不可点击且显示状态
                 btnUpImag.setEnabled(false);
                 switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务 1004 小米游戏任务
                     case TASK_TYPE_CREDIT_CARD:
@@ -414,7 +413,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                             case OPEN_MODE_TYPE_H5_OUT:
                             case OPEN_MODE_TYPE_H5_IN:
                                 type = TASK_TYPE_COMMON_H5 + taskEty.getOpen_mode();
-                                btnTaskItem.setText(START_TASK);
+                                btnTaskItem.setText(R.string.task_start);
                                 break;
                             case OPEN_MODE_TYPE_APP:
                             default:
@@ -451,12 +450,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         } else {//任务未下线
             if (gettaskAcceptedEty == null) {//无任务记录-->显示领取任务按钮
                 btnUpImag.setVisibility(View.GONE);//不显示第二按钮
-                btnTaskItem.setText(CommonUtil.GET_TASK);
+                btnTaskItem.setText(R.string.get_task);
             } else {//有任务记录
                 switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务 1004 小米游戏任务
                     case TASK_TYPE_H5://h5业务
                         type = TASK_TYPE_COMMON_H5;
-                        btnTaskItem.setText(START_TASK);
+                        btnTaskItem.setText(R.string.task_start);
                         switch (gettaskAcceptedEty.getStatus()) {
                             case 1://"已接受任务";
                             case 2:// "正在进行中";
@@ -516,7 +515,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                             case OPEN_MODE_TYPE_H5_OUT:
                             case OPEN_MODE_TYPE_H5_IN:
                                 type = TASK_TYPE_COMMON_H5 + taskEty.getOpen_mode();
-                                btnTaskItem.setText(START_TASK);
+                                btnTaskItem.setText(R.string.task_start);
                                 break;
                             case OPEN_MODE_TYPE_APP:
                             default:
@@ -539,7 +538,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         switch (gettaskAcceptedEty.getAllowSubmit()) {
             case TaskAcceptedEty.ALLOW_SUBMIT_NO:
                 btnUpImag.setEnabled(false);
-                btnUpImag.setText("任务失败");
+                btnUpImag.setText(R.string.task_failed);
                 btnUpImag.setVisibility(View.VISIBLE);
                 break;
             case TaskAcceptedEty.ALLOW_SUBMIT_YES:
@@ -555,7 +554,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         switch (gettaskAcceptedEty.getAllowSubmit()) {
             case TaskAcceptedEty.ALLOW_SUBMIT_NO:
                 btnUpImag.setEnabled(false);
-                btnUpImag.setText("任务失败");
+                btnUpImag.setText(R.string.task_failed);
                 btnUpImag.setVisibility(View.VISIBLE);
                 break;
             case TaskAcceptedEty.ALLOW_SUBMIT_YES:
@@ -577,7 +576,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         if (hasChildRunning) {//有子任务正在进行
         } else if (hasChildCanAccepted) {//有子任务处于可领取状态
             btnUpImag.setVisibility(View.GONE);
-            btnTaskItem.setText(CommonUtil.GET_TASK);//可以领取子任务
+            btnTaskItem.setText(R.string.get_task);
             type = TASK_TYPE_INIT;
         } else {//不能上传截图则不显示第二按钮
             btnUpImag.setVisibility(View.GONE);
@@ -608,7 +607,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             btnUpImag.setText("上传截图");
         } else if (hasChildCanAccepted) {//有子任务处于可领取状态
             btnUpImag.setVisibility(View.GONE);
-            btnTaskItem.setText(CommonUtil.GET_TASK);//可以领取子任务
+            btnTaskItem.setText(R.string.get_task);
             type = TASK_TYPE_INIT;
         } else {//不能上传截图则不显示第二按钮
             btnUpImag.setVisibility(View.GONE);
@@ -865,7 +864,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     break;
                 case R.id.task_detail_cancel://尝试取消任务
                     if (gettaskAcceptedEty != null && gettaskAcceptedEty.getId() > 0)
-                        取消任务(gettaskAcceptedEty.getId(), new Action1<Integer>() {
+                        cancelTask(gettaskAcceptedEty.getId(), new Action1<Integer>() {
                             @Override
                             public void call(Integer integer) {
                                 hideProgress();
@@ -901,7 +900,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             return;
         }
         if (gettaskAcceptedEty == null || TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots())) {
-            G.showToast("任务截图为空");
+            G.showToast(getString(R.string.task_screenshot_null));
             return;
         }
         Jump2View.getInstance().showImgs(activity, 0, gettaskAcceptedEty.getScreenshots());
@@ -948,9 +947,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 if (taskReleaseEty.getAccepted_task_id() > 0) {
                     Jump2View.getInstance()
                             .goNoticeAct(activity, new DialogEntity(null,
-                                    "是否放弃正在运行中的任务?",
-                                    "是",
-                                    "否",
+                                    getString(R.string.give_up_doing_task_or_not),
+                                    getString(R.string.yes),
+                                    getString(R.string.no),
                                     null));
                 } else {
                     acceptedTask();
@@ -1072,7 +1071,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 }
             }
         } else {
-            G.showToast("暂无任务可以上传");
+            G.showToast(getString(R.string.no_task_can_upload));
         }
         UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_UPLOAD_PICTURE);
     }
@@ -1142,7 +1141,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                                 e.printStackTrace();
                             }
 
-                            G.showToast(String.format(Locale.CHINA, "恭喜你，任务已完成，获得奖励%s元", TextUtils.isEmpty(amount) ? taskReleaseEty.getBonusText() : amount));
+                            G.showToast(String.format(Locale.CHINA, "恭喜你，奖励已完成，获得奖励%s元", TextUtils.isEmpty(amount) ? taskReleaseEty.getBonusText() : amount));
                             finish();
                         }
 
@@ -1195,23 +1194,26 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         if (taskEty != null) {
             int thisRun = taskEty.getRunTask();
             if (thisRun == 1) {//接受了任务
-                llInfos.addView(getStep(CommonUtil.GET_TASK, "已完成", 0));
+                llInfos.addView(getStep(R.string.get_task, "已完成", 0));
                 if (taskEty.getTask_type() == TASK_TYPE_CREDIT_CARD) {//信用卡
                     llInfos.addView(getStep("信用卡注册", "待完成", 0));
                 } else if (PackageUtil.isAppInstalled(SheepApp.getInstance(), taskEty.getPackage_names())) {
                     llInfos.addView(getStep("APP下载", "已完成", 0));
-                    llInfos.addView(getStep("完成任务", "进行中", 1));
+                    llInfos.addView(getStep(getString(R.string.task_finish), "进行中", 1));
                 } else {
                     llInfos.addView(getStep("APP下载", "待完成", 2));
                 }
             } else {
-                llInfos.addView(getStep(CommonUtil.GET_TASK, "待完成", 2));
+                llInfos.addView(getStep(R.string.get_task, "待完成", 2));
             }
         } else {
-            llInfos.addView(getStep(CommonUtil.GET_TASK, "待完成", 2));
+            llInfos.addView(getStep(R.string.get_task, "待完成", 2));
         }
     }
 
+    private View getStep(int step, String state, int color) {
+        return getStep(getString(step), state, color);
+    }
 
     private View getStep(String step, String state, int color) {
         View view = View.inflate(this, R.layout.task_step_info, null);
@@ -1361,7 +1363,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             case 0:
                 if (resultCode == RESULT_OK) {
                     if (taskReleaseEty != null && taskReleaseEty.getAccepted_task_id() > 0) {
-                        取消任务(taskReleaseEty.getAccepted_task_id(), new Action1<Integer>() {
+                        cancelTask(taskReleaseEty.getAccepted_task_id(), new Action1<Integer>() {
                             @Override
                             public void call(Integer integer) {
                                 taskReleaseEty.setAccepted_task_id(0);
@@ -1397,7 +1399,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
     }
 
-    private void 取消任务(int id, final Action1<Integer> action1) {
+    private void cancelTask(int id, final Action1<Integer> action1) {
         showProgress(true);
         SheepApp.getInstance()
                 .getNetComponent()

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

@@ -80,7 +80,7 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
         newbieTask = (NewbieTask) getIntent().getSerializableExtra("task_entity");
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
-                .setTitle(activity, "加入官方QQ群任务详情")
+                .setTitle(activity, getString(R.string.join_qq_group_task_detail))
                 .setTitleFinish(activity);
         detail_item_layout_1.setVisibility(View.GONE);
         detail_item_layout_3.setVisibility(View.GONE);

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

@@ -95,7 +95,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
         activity = this;
         id = getIntent().getIntExtra("id", 0);
         TitleBarUtils.getInstance()
-                .setTitle(activity, "任务详情")
+                .setTitle(activity, getString(R.string.task_detail))
                 .setTitleFinish(activity);
         btnUpImag.setVisibility(View.GONE);
     }
@@ -209,10 +209,10 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
         switch (view.getId()) {
             case R.id.detail_task_tv://查看任务截图
                 if (TextUtils.isEmpty(taskEty.getScreenshots())) {
-                    G.showToast("任务截图为空");
+                    G.showToast(R.string.task_screenshot_null);
                     return;
                 }
-                Jump2View.getInstance().goWeb(activity, taskEty.getScreenshots(), "任务提交示意");
+                Jump2View.getInstance().goWeb(activity, taskEty.getScreenshots(), getString(R.string.task_submit_tip));
                 break;
             case R.id.web_text:
                 break;
@@ -282,17 +282,17 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     private void taskSchedule() {
         llInfos.removeAllViews();
         if (taskEty != null && taskReleaseEty != null && taskReleaseEty.getAccepted_task_id() != 0) {
-            llInfos.addView(getStep("领取任务", "已完成", 0));
+            llInfos.addView(getStep(getString(R.string.get_task), "已完成", 0));
             if (taskEty.getTask_type() == TASK_TYPE_CREDIT_CARD) {//信用卡
                 llInfos.addView(getStep("信用卡注册", "待完成", 2 ));
             } else if (PackageUtil.isAppInstalled(SheepApp.getInstance(), taskEty.getPackage_names())) {
                 llInfos.addView(getStep("下载游戏", "已完成", 0));
-                llInfos.addView(getStep("完成任务", "进行中", 1));
+                llInfos.addView(getStep(getString(R.string.task_finish), "进行中", 1));
             } else {
                 llInfos.addView(getStep("下载游戏", "待完成", 2));
             }
         } else {
-            llInfos.addView(getStep("领取任务", "待完成", 2));
+            llInfos.addView(getStep(getString(R.string.get_task), "待完成", 2));
         }
     }
 

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

@@ -70,7 +70,7 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View {
                 .build()
                 .inject(this);
         TitleBarUtils.getInstance()
-                .setTitle(this, "任务记录")
+                .setTitle(this, getString(R.string.task_record))
                 .setTitleFinish(this);
         swipe_container.setFooterView(this, withdrawalListview, R.layout.listview_footer);
         adp = new TaskListItemAdp(activity , etyList);

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

@@ -64,7 +64,7 @@ public class TryMakeMoneyact extends BaseActivity {
                     @Override
                     public void onClick(View view) {
                         ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("温馨提示").setBtnLeftText("我知道了")
-                                .setMsg("该栏目为现金任务，参与好友提成。"));
+                                .setMsg(getString(R.string.cash_task_and_share_friend_benefit)));
                     }
                 })
                 .setRightImgBotton(activity, R.drawable.index_download, new View.OnClickListener() {

app/src/main/java/com/sheep/gamegroup/view/adapter/DialogNewbieTaskAdp.java

@@ -92,7 +92,7 @@ public class DialogNewbieTaskAdp extends BaseAdapter {
                 tip = "%d.成功邀请好友注册（+%.1f元）";
                 break;
             case 4:
-                tip = "%d.首次做任务赚钱（额外奖+%.1f元）";
+                tip = "%d.首次完成奖励赚钱（额外奖+%.1f元）";
                 break;
             case 6://加入官方QQ群
                 tip = "%d.加入官方QQ群（+%.1f元）";

app/src/main/java/com/sheep/gamegroup/view/adapter/NewbieTaskAdp.java

@@ -134,7 +134,7 @@ public class NewbieTaskAdp extends BaseAdapter {
                     break;
                 case 5://注册账号并登录
                     if (BuildConfig.DEBUG) {
-                        G.showToast("测试：服务器返回数据错误，这个任务可能没有完成？");
+                        G.showToast("测试：服务器返回数据错误，这个奖励可能没有完成？");
                     }
 //                    if(TestUtil.isLTVersion3_4_5())//3.4.5以前版本才调用下面的方法
                         isShow(context);

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java

@@ -134,7 +134,7 @@ public class TaskListItemAdp extends BaseAdapter {
             case TaskAcceptedEty.STATUS_OFF_LINE:
                 textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_10_radius);
                 textView.setTextColor(context.getResources().getColor(R.color.gray_CCCCCC));
-                textView.setText("任务失败");
+                textView.setText(context.getString(R.string.task_failed));
                 break;
             case TaskAcceptedEty.STATUS_AUDIT_FAILURE:
                 textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
@@ -150,7 +150,7 @@ public class TaskListItemAdp extends BaseAdapter {
             case TaskAcceptedEty.ALLOW_SUBMIT_NO:
                 textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_10_radius);
                 textView.setTextColor(context.getResources().getColor(R.color.gray_CCCCCC));
-                textView.setText("任务失败");
+                textView.setText(R.string.task_failed);
                 if (!TextUtils.isEmpty(ety.getRemarks())) {
                     desc_tv.setVisibility(View.VISIBLE);
                     desc_tv.setText(context.getString(R.string.fail_reason, ety.getRemarks()));

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -617,7 +617,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 
 
                 if("0".equals(taskReleaseEty.getLast_num())){
-                    detail_task_tv.setText("任务已抢光");
+                    detail_task_tv.setText(R.string.task_taken_all);
                     detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
                     detail_task_tv.setEnabled(false);
                     viewHolder.itemView.setEnabled(false);
@@ -754,7 +754,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                             "截止时间:" + taskReleaseEty.getDeadline());
                 }
 
-                ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setText("取消任务");
+                ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setText(R.string.cancel);
 
                 if((is_succession == 1 || is_succession == 3)
                         &&  (taskAcceptedEty.getChild_task_id() > 1

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

@@ -179,7 +179,7 @@ public class DialogGameOrTaskOrGift {
                 }
             } else {
                 if (BuildConfig.DEBUG)
-                    G.showToast("不是礼包，不是现金任务，不是游戏，还可能是什么");
+                    G.showToast(R.string.tip_not_gift_cash_game_or_else);
             }
         }
     }
@@ -326,7 +326,7 @@ public class DialogGameOrTaskOrGift {
                     DataUtil.putAsInt(DataKey.KEY_ORDER, robTask.getOrder());
                     ViewUtil.newInstance().showRobDutyDialog(activity, robTask);
                 } else {
-                    G.showToast("任务已被抢光！请实时关注任务发布！");
+                    G.showToast(R.string.task_sold_out_focus_publish);
                     if (activity instanceof ActMain && DataUtil.getAsBoolean("tryShowHalfScreenAd", false)) {
                         DataUtil.putAsBoolean("tryShowHalfScreenAd", false);
                         Jump2View.getInstance().tryShowHalfScreenAd(activity, ((ActMain) activity).getContainer());

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

@@ -39,7 +39,7 @@ public class DialogNewbieTask1 {
                     start = "获得邀请好友注册奖励";
                     break;
                 case 4://首次做任务赚钱
-                    start = "获得首次做任务赚钱额外奖励";
+                    start = activity.getString(R.string.get_first_task_and_extra);
                     break;
                 case 6://加入官方QQ群
                     start = "获得加入官方QQ群奖励";

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

@@ -38,7 +38,7 @@ public class DialogNewbieTaskList {
         View dialog_close = dialog_parent.findViewById(R.id.dialog_close);
         LinearLayout dialog_center_ll = dialog_parent.findViewById(R.id.dialog_center_ll);
         View view = LayoutInflater.from(activity).inflate(R.layout.dialog_newbie_task_list, dialog_center_ll, true);
-        dialog_title.setText("新手任务");
+        dialog_title.setText(R.string.fresh_task);
 
 
         View.OnClickListener onClickListener =  new View.OnClickListener() {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoney.java

@@ -258,7 +258,7 @@ public class FgtAskGetMoney extends BaseFragment {
                 break;
             case R.id.ask_act_rule:
                 ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("活动规则").setBtnLeftText("我知道了").setTheme(DialogConfig.THEME_PURPLE)
-                        .setMsg("首邀好友，好友下载并登录小绵羊，既可获得2.5绵羊币\n首邀好友完成新手任务，邀请人可额外再获得2.5绵羊币"));
+                        .setMsg(getString(R.string.tip_invite_for_more_coin)));
                 break;
             case R.id.refresh://只是一个点击，用来遮盖底部不可见的view的点击
                 break;

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtHomeTaskReleaseList.java

@@ -344,7 +344,7 @@ public class FgtHomeTaskReleaseList extends BaseFragment implements TryMakeMoney
 
     @Override
     public void giveUpTaskSuccesView(Object object) {
-        G.showToast("取消任务成功");
+        G.showToast(R.string.cancel_task_success);
         CommonUtil.getInstance().updateAutoCheck(null);
         refreshData();
     }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMainAudit.java

@@ -52,7 +52,7 @@ public class FgtMainAudit extends BaseFragment {
     ImageView my_money_dingxiang_amount_iv;
     private Activity activity;
 
-    public static final String[] tabNames = {"审核中", "任务成功", "任务失败"};
+//    public static final String[] tabNames = {"审核中", "任务成功", "任务失败"};
     private TitleFragmentListAdapter mAdapter;
 
     public static FgtMainAudit newInstance(int index) {
@@ -169,9 +169,9 @@ public class FgtMainAudit extends BaseFragment {
     public static final int POSITION_FAILED = 2;
     protected void initView() {
         mAdapter = new TitleFragmentListAdapter(getChildFragmentManager());
-        mAdapter.add(FgtAudit.newInstance(POSITION_ACTIVITY + 1), tabNames[POSITION_ACTIVITY]);
-        mAdapter.add(FgtAudit.newInstance(POSITION_SUCCESS + 1), tabNames[POSITION_SUCCESS]);
-        mAdapter.add(FgtAudit.newInstance(POSITION_FAILED + 1), tabNames[POSITION_FAILED]);
+        mAdapter.add(FgtAudit.newInstance(POSITION_ACTIVITY + 1), getString(R.string.auditing));
+        mAdapter.add(FgtAudit.newInstance(POSITION_SUCCESS + 1), getString(R.string.task_success));
+        mAdapter.add(FgtAudit.newInstance(POSITION_FAILED + 1), getString(R.string.task_failed));
         FgtAudit fgtAudit = (FgtAudit) mAdapter.getItem(curPosition);
         if(fgtAudit != null){
             fgtAudit.setFirstPage(true);

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -114,6 +114,8 @@ public class FgtPersonalCenter extends BaseFragment {
     View fgt_pc_item_vip_v;
     @BindView(R.id.fgt_pc_item_vip_ll)
     View fgt_pc_item_vip_ll;
+    @BindView(R.id.vip_flag_view)
+    View vipFlagView;
 
     public UserEntity userEntity;
     private String faqUrl;
@@ -152,7 +154,7 @@ public class FgtPersonalCenter extends BaseFragment {
             img_baseactivity_title.setVisibility(View.INVISIBLE);
             txt_baseactivity_title.setVisibility(View.INVISIBLE);
         }
-        if(Config.USE_CHRISTMAS_THEME) {
+        if (Config.USE_CHRISTMAS_THEME) {
             View homeTopView = (View) img_baseactivity_title.getParent().getParent();
             homeTopView.setBackgroundResource(R.mipmap.christmas_bg_pc_top);
         }
@@ -202,7 +204,7 @@ public class FgtPersonalCenter extends BaseFragment {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         UserTaskExistsNew userTaskExistsNew = baseMessage.getData(UserTaskExistsNew.class);
-                        if (userTaskExistsNew != null) {
+                        if (getActivity() != null && isAdded() && userTaskExistsNew != null) {
                             ViewUtil.setText(audit_activity, getString(R.string.audit_activity, String.valueOf(userTaskExistsNew.getActivity_task_num())));
                             ViewUtil.setVisibility(audit_activity_oval, userTaskExistsNew.getActivity_new_num() > 0);
                             ViewUtil.setText(audit_success, getString(R.string.audit_success, String.valueOf(userTaskExistsNew.getSuccess_task_num())));
@@ -224,6 +226,7 @@ public class FgtPersonalCenter extends BaseFragment {
 
     //用户中心模块数据
     private List<UserCenterModule> userCenterModuleList = ListUtil.emptyList();
+
     //初始化用户中心模块界面
     private void initUserModuleItemView() {
         GridLayoutManager manager = new GridLayoutManager(SheepApp.getInstance(), 4);
@@ -256,22 +259,22 @@ public class FgtPersonalCenter extends BaseFragment {
      */
     private void initUserModuleItem() {
         SheepApp.getInstance().getNetComponent().getApiService().getUserModule()
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.user_module);
-                                if (isNewData) {
-                                    ArrayList<UserCenterModule> newList = baseMessage.getDataList(UserCenterModule.class);
-                                    loadUserModuleList(newList);
-                                }
-                            }
-
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                            }
-                        });
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.user_module);
+                        if (isNewData) {
+                            ArrayList<UserCenterModule> newList = baseMessage.getDataList(UserCenterModule.class);
+                            loadUserModuleList(newList);
+                        }
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                    }
+                });
     }
 
     private void initUserInfo() {
@@ -296,6 +299,7 @@ public class FgtPersonalCenter extends BaseFragment {
         ViewUtil.setVisibility(fgt_pc_item_top_vip_tv, userEntity.isVip());
         ViewUtil.setVisibility(fgt_pc_item_vip_v, userEntity.isVip());
         ViewUtil.setVisibility(fgt_pc_item_vip_ll, userEntity.isVip());
+        vipFlagView.setVisibility(userEntity.isVIP()?View.VISIBLE:View.GONE);
     }
 
     /**

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -1082,7 +1082,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                                 G.showToast(e.getMessage());
                             }
                         } else {
-                            G.showToast("任务已被抢光！请实时关注任务发布！");
+                            G.showToast(R.string.task_sold_out_focus_publish);
                         }
                     }
                 });
@@ -1122,7 +1122,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void giveUpTaskSuccesView(Object object) {
-        G.showToast("取消任务成功");
+        G.showToast(R.string.cancel_task_success);
         CommonUtil.getInstance().updateAutoCheck(null);
         refreshTaskList();
         FgtHomeTaskReleaseList item = (FgtHomeTaskReleaseList) mAdapter.getItem(0);//因为放弃了任务，所以刷新可以接收的任务列表
@@ -1647,8 +1647,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
         if (CommonUtil.getInstance().addNewTask(activity, userEntity) && homeListEntitysGridview != null) {
             HomeListEntity homeListEntityNewTask = new HomeListEntity();
-            homeListEntityNewTask.setTitle("新手任务");
-            homeListEntityNewTask.setDesc("新手任务");
+            homeListEntityNewTask.setTitle(getString(R.string.fresh_task));
+            homeListEntityNewTask.setDesc(getString(R.string.fresh_task));
             homeListEntityNewTask.setJump("-1");
             homeListEntityNewTask.setIcon("http://cdngame.kuaifazs.com/homepage_xinshourw.png");
             homeListEntitys.add(0, homeListEntityNewTask);

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -410,7 +410,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
     @Override
     public void giveUpTaskSuccesView(Object object) {
-        G.showToast("取消任务成功");
+        G.showToast(R.string.cancel_task_success);
         CommonUtil.getInstance().updateAutoCheck(null);
         refreshData();
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/service/DownloadService.java

@@ -12,6 +12,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 
 import com.kfzs.duanduan.utils.ApkUtils;
@@ -19,6 +20,7 @@ import com.kfzs.duanduan.view.DialogStorageLow;
 import com.liulishuo.okdownload.DownloadListener;
 import com.liulishuo.okdownload.DownloadTask;
 import com.liulishuo.okdownload.SpeedCalculator;
+import com.liulishuo.okdownload.core.Util;
 import com.liulishuo.okdownload.core.breakpoint.BlockInfo;
 import com.liulishuo.okdownload.core.breakpoint.BreakpointInfo;
 import com.liulishuo.okdownload.core.cause.EndCause;
@@ -52,12 +54,36 @@ import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
 
 public class DownloadService extends Service {
 
+    private final static int TAG_RETRY = 1001;
+
     private DownloadUtil downloadUtil;
 
     @Override
     public void onCreate() {
         super.onCreate();
         downloadUtil = new DownloadUtil();
+        Util.setLogger(new Util.Logger() {
+            @Override
+            public void e(String tag, String msg, Exception e) {
+                Log.e("sheep-" + tag, msg + "\n" + e.getMessage());
+                e.printStackTrace();
+            }
+
+            @Override
+            public void w(String tag, String msg) {
+                Log.w("sheep-" + tag, msg);
+            }
+
+            @Override
+            public void d(String tag, String msg) {
+                Log.d("sheep-" + tag, msg);
+            }
+
+            @Override
+            public void i(String tag, String msg) {
+                Log.i("sheep-" + tag, msg);
+            }
+        });
     }
 
     @Override
@@ -65,14 +91,19 @@ public class DownloadService extends Service {
         if (intent != null) {
             String download_url = intent.getStringExtra("download_url");
             String file_path = intent.getStringExtra("file_path");
-            if (download_url != null && file_path != null) {
-                DownloadTask task = DownloadUtil.getTask(download_url, file_path);
-                task.enqueue(downloadListener);
-            }
+            startDownload(download_url, file_path, 0);
         }
         return super.onStartCommand(intent, flags, startId);
     }
 
+    private void startDownload(String download_url, String file_path, int retry) {
+        if (download_url != null && file_path != null) {
+            DownloadTask task = DownloadUtil.getTask(download_url, file_path);
+            task.addTag(TAG_RETRY, retry);
+            task.enqueue(downloadListener);
+        }
+    }
+
     private DownloadListener downloadListener = new DownloadListener4WithSpeed() {
         @Override
         public void taskStart(@NonNull DownloadTask task) {
@@ -118,6 +149,10 @@ public class DownloadService extends Service {
         @Override
         public void taskEnd(@NonNull DownloadTask task, @NonNull EndCause cause, @Nullable Exception realCause, @NonNull SpeedCalculator taskSpeed) {
             LogUtil.println("DownloadListener", "taskEnd", "cause", cause.name(), "realCause", realCause != null ? realCause.getMessage() : "null", "taskSpeed", taskSpeed.averageSpeed());
+            if (realCause != null) {
+                realCause.printStackTrace();
+            }
+            new Exception("Download exception: ").printStackTrace();
             DownLoadInfo downLoadInfo;
             switch (cause) {
                 case COMPLETED://下载完成
@@ -136,29 +171,26 @@ public class DownloadService extends Service {
                     }
                     downLoadInfo = downloadUtil.getDownloadTaskByUrl(task.getUrl());
                     downLoadInfo.setMStatus(DownloadUtil.STATUS_FAIL);
-                    if(realCause != null)
+                    if (realCause != null)
                         downLoadInfo.setRealCauseMsg(realCause.getMessage());
                     DDProviderHelper.getInstance().updateDownload(downLoadInfo);
                     EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DOWNLOAD_FAIL).setData(downLoadInfo));
                     break;
                 case FILE_BUSY:
                 case ERROR://下载错误
-                    //空间不足，弹框提示
-                    try {
-                        if (0 <= task.getReadBufferSize() && task.getReadBufferSize() > G.getFreeSpaceB()) {
-                            DialogStorageLow.showDialog(realCause != null ? realCause.getMessage() : null);
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
                     downLoadInfo = downloadUtil.getDownloadTaskByUrl(task.getUrl());
-                    if(downLoadInfo!=null) {
+                    if (downLoadInfo != null) {
                         downLoadInfo.setMStatus(DownloadUtil.STATUS_FAIL);
                         if (realCause != null)
                             downLoadInfo.setRealCauseMsg(realCause.getMessage());
                         DDProviderHelper.getInstance().updateDownload(downLoadInfo);
                         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DOWNLOAD_FAIL).setData(downLoadInfo));
                     }
+                    int retry = (int) task.getTag(TAG_RETRY);
+                    if (retry < 10) {
+                        startDownload(task.getUrl(), task.getFile().getAbsolutePath(), ++retry);
+                        Log.e("DownloadRetry", "Retry " + retry + "   " + task.getUrl());
+                    }
                     break;
                 case CANCELED://取消下载
                     downLoadInfo = downloadUtil.setDownloadTaskStatus(task.getUrl(), DownloadUtil.STATUS_PAUSE);

app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/SignActivity.java

@@ -416,7 +416,7 @@ public class SignActivity extends BaseUMActivity {
                         G.showToast(e.getMessage());
                     }
                 } else {
-                    G.showToast("任务已被抢光！请实时关注任务发布！");
+                    G.showToast(R.string.task_sold_out_focus_publish);
                 }
             }
         });

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

@@ -18,8 +18,11 @@
         android:visibility="visible">
         <TextView
             style="@style/style_ash_tv"
+            android:text="@string/task_flow"/>
+        <TextView
+            style="@style/style_ash_tv"
             android:layout_marginRight="@dimen/common_margin_10"
-            android:text="任务流程:"/>
+            android:text=":"/>
         <TextView
             style="@style/style_ash_num"
             android:text="1"/>

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

@@ -10,7 +10,7 @@
         android:id="@+id/my_price"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="新手任务"
+        android:text="@string/fresh_task"
         android:textColor="#7e7e7e"
         android:textSize="14sp"
         android:padding="@dimen/content_padding_10"/>

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

@@ -11,7 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
-        android:text="xxxxx任务上线"
+        android:text="xxxxx奖励上线"
         android:textColor="#333333"
         android:textSize="18sp" />
 
@@ -28,7 +28,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="20dp"
         android:scrollbars="vertical"
-        android:text="x  x任务上线，限量1000分，任务奖励1元，赶紧去领取吧~!xx任务上线，限量1000分，任务奖励1元，赶紧去领取吧~!"
+        android:text="x  x奖励上线，限量1000分，奖励1元，赶紧去领取吧~!xx奖励上线，限量1000分，奖励1元，赶紧去领取吧~!"
         android:textColor="#666666"
         android:textSize="13sp" />
 </LinearLayout>

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

@@ -51,7 +51,7 @@
                     android:layout_marginTop="150dp"
                     android:layout_marginBottom="50dp"
                     android:lineSpacingExtra="9dp"
-                    android:text="简单来说，只要你有一部手机，下载小绵羊APP，每天动动手指完成任务就能赚取零花钱，月入1000元~"
+                    android:text="@string/tip_simple_words_app_description"
                     android:textColor="@color/white"
                     android:textSize="14sp" />
             </RelativeLayout>
@@ -77,7 +77,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="28dp"
                     android:layout_marginTop="90dp"
-                    android:text="任务提交流程"
+                    android:text="@string/task_submit_flow"
                     android:textColor="#259FEC"
                     android:textSize="30sp"
                     android:textStyle="bold" />
@@ -336,7 +336,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="150dp"
                         android:gravity="center"
-                        android:text="个性化定制游戏任务"
+                        android:text="@string/customize_game_task"
                         android:textColor="@color/white"
                         android:textSize="12sp"
                         app:layout_constraintEnd_toEndOf="@+id/understand_sheep_a_tv_1"
@@ -396,7 +396,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="190dp"
                         android:gravity="center"
-                        android:text="试玩任务"
+                        android:text="@string/try_task"
                         android:textColor="@color/white"
                         android:textSize="12sp"
                         app:layout_constraintEnd_toEndOf="@+id/understand_sheep_b_tv_1"
@@ -530,7 +530,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="190dp"
                         android:gravity="center"
-                        android:text="自动完成任务"
+                        android:text="@string/auto_finish_task"
                         android:textColor="@color/white"
                         android:textSize="12sp"
                         app:layout_constraintEnd_toEndOf="@+id/understand_sheep_c_tv_1"

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

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/white_F9F9F9">
-
-    <include
-        layout="@layout/title"/>
-    <WebView
-        android:id="@+id/webview"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:scrollbars="none"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"/>
-</LinearLayout>

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

@@ -51,7 +51,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:singleLine="true"
-                android:text="xx任务上线，限量1000分，任务奖励1元，赶紧去领.102122."
+                android:text="xx奖励上线，限量1000分，奖励1元，赶紧去领.102122."
                 android:textColor="#ff666666"
                 android:textSize="13sp" />
 

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

@@ -70,7 +70,7 @@
             android:layout_marginTop="3dp"
             android:ellipsize="end"
             android:maxLines="2"
-            android:text="xx任务上线，限量1000分，任务奖励1元，赶紧去领."
+            android:text="xx奖励上线，限量1000分，奖励1元，赶紧去领."
             android:textColor="#ff666666"
             android:textSize="13sp" />
 

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

@@ -16,7 +16,7 @@
             android:id="@+id/item_name_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="·第一天签到任务"
+            android:text="@string/first_day_checkin_task"
             android:adjustViewBounds="true"
             style="@style/txt_style_15"
             android:lines="1"
@@ -43,7 +43,7 @@
             android:id="@+id/state_task_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="任务截图"
+            android:text="@string/task_screenshot"
             app:layout_constraintHorizontal_bias="0.0"
             android:minWidth="@dimen/view_size_73"
             android:adjustViewBounds="true"

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

@@ -104,7 +104,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:text="为了避免机器刷单，请绑定手机号后领取任务奖励"
+                    android:text="@string/avoid_wrong_order_bind_phone"
                     android:textColor="@color/black_444444"
                     android:textSize="11dp"
                     android:visibility="gone" />

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

@@ -157,7 +157,7 @@
         android:layout_marginEnd="22dp"
         android:layout_marginStart="22dp"
         android:textSize="10sp"
-        android:text="小提示：安装一周不卸载，每日签到任务赚更多"
+        android:text="@string/tip_no_uninstall_a_week_more_task"
         android:layout_marginBottom="@dimen/content_padding_20"/>
 
     <TextView

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

@@ -72,10 +72,9 @@
 
         <ImageView
             android:id="@+id/icon_img_iv"
-            android:layout_width="50dp"
+            android:layout_width="55dp"
             android:layout_height="55dp"
-            android:paddingTop="5dp"
-            android:layout_marginTop="55dp"
+            android:layout_marginTop="60dp"
             android:layout_marginBottom="@dimen/content_padding"
             android:layout_marginStart="@dimen/content_padding_15"
             android:src="@drawable/avatar"
@@ -83,42 +82,52 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/fgt_pc_item_top_vip_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/content_padding_10"
-            android:drawableStart="@mipmap/ic_vip_1"
-            android:drawablePadding="5dp"
-            android:visibility="gone"
-            android:text="VIP"
-            android:textSize="12sp"
-            android:textColor="@color/white"
-            app:layout_constraintStart_toEndOf="@id/icon_img_iv"
-            app:layout_constraintTop_toTopOf="@id/icon_img_iv" />
-
-        <TextView
             android:id="@+id/name_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/content_padding_small"
             android:layout_marginStart="@dimen/content_padding_10"
-            android:layout_marginTop="5dp"
-            android:text=""
+            android:layout_marginTop="@dimen/content_padding_3"
+            android:layout_marginBottom="@dimen/content_padding_3"
+            android:text="Hanjing"
             android:textColor="@color/txt_white"
-            android:textSize="@dimen/text_size_15"
-            app:layout_constraintStart_toEndOf="@id/icon_img_iv"
-            app:layout_constraintTop_toBottomOf="@id/fgt_pc_item_top_vip_tv" />
+            android:textSize="@dimen/text_size_12"
+            app:layout_constraintStart_toEndOf="@+id/icon_img_iv"
+            app:layout_constraintBottom_toTopOf="@+id/sheep_num_tv" />
 
         <TextView
             android:id="@+id/sheep_num_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/content_padding_small"
             android:layout_marginStart="@dimen/content_padding_10"
             android:text="绵羊号："
             android:textColor="@color/txt_white"
             android:textSize="@dimen/text_size_10"
-            app:layout_constraintBottom_toBottomOf="@id/icon_img_iv"
-            app:layout_constraintStart_toEndOf="@id/icon_img_iv" />
+            app:layout_constraintBottom_toBottomOf="@+id/icon_img_iv"
+            app:layout_constraintStart_toEndOf="@+id/icon_img_iv" />
+
+        <LinearLayout
+            android:id="@+id/vip_flag_view"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:visibility="gone"
+            android:layout_marginStart="@dimen/content_padding_10"
+            app:layout_constraintStart_toEndOf="@+id/icon_img_iv"
+            app:layout_constraintBottom_toTopOf="@+id/name_tv">
+            <ImageView
+                android:src="@mipmap/vip_1"
+                android:layout_width="12dp"
+                android:layout_height="12dp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:text="VIP"
+                android:textColor="@color/txt_white"
+                android:textSize="@dimen/text_size_12"/>
+        </LinearLayout>
     </android.support.constraint.ConstraintLayout>
 
     <LinearLayout

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

@@ -88,7 +88,7 @@
     <TextView
         android:id="@+id/find_information_game_task_top"
         style="@style/style_button_find"
-        android:text="接受任务"
+        android:text="@string/task_receipt"
         android:layout_marginTop="5dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
@@ -97,7 +97,7 @@
     <TextView
         android:id="@+id/find_information_game_task_center"
         style="@style/style_button_find"
-        android:text="接受任务"
+        android:text="@string/task_receipt"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -106,7 +106,7 @@
     <TextView
         android:id="@+id/find_information_game_task_bottom"
         style="@style/style_button_find"
-        android:text="接受任务"
+        android:text="@string/task_receipt"
         android:layout_marginBottom="5dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -44,7 +44,7 @@
     <TextView
         android:id="@+id/find_information_game_task_center"
         style="@style/style_button_find"
-        android:text="接受任务"
+        android:text="@string/task_receipt"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

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

@@ -85,13 +85,13 @@
                 android:id="@+id/detail_task_tv"
                 style="@style/style_button_find"
                 android:layout_marginTop="@dimen/content_padding_small"
-                android:text="取消任务" />
+                android:text="@string/task_cancel" />
 
             <TextView
                 android:id="@+id/detail_task_tv_down"
                 style="@style/style_button_find"
                 android:layout_marginTop="@dimen/content_padding_small"
-                android:text="取消任务"
+                android:text="@string/task_cancel"
                 android:visibility="gone" />
 
         </RelativeLayout>

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

@@ -145,7 +145,7 @@
             android:id="@+id/item_download_welfare_btn_top"
             style="@style/style_button_find"
             android:layout_marginTop="21dp"
-            android:text="取消任务"
+            android:text="@string/task_cancel"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -155,7 +155,7 @@
             style="@style/style_button_find"
             android:layout_centerInParent="true"
             android:layout_marginTop="16dp"
-            android:text="取消任务"
+            android:text="@string/task_cancel"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/item_download_welfare_iv"
             app:layout_constraintEnd_toEndOf="parent"
@@ -165,7 +165,7 @@
             android:id="@+id/item_download_welfare_btn_bottom"
             style="@style/style_button_find"
             android:layout_marginBottom="5dp"
-            android:text="取消任务"
+            android:text="@string/task_cancel"
             app:layout_constraintBottom_toBottomOf="@+id/item_download_welfare_iv"
             app:layout_constraintEnd_toEndOf="parent" />
     </android.support.constraint.ConstraintLayout>

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

@@ -16,7 +16,7 @@
         android:drawableLeft="@drawable/shape_small_black_oval"
         android:drawablePadding="5dp"
         app:isAliganCenter="false"
-        android:text="将微信号托管到小绵羊（数量不限），由平台免费帮助用户自动挂机完成任务，每个微信号每月躺着赚90元！" />
+        android:text="@string/tip_wechat_support_for_auto_task" />
     <com.hedan.textdrawablelibrary.TextViewDrawable
         style="@style/hint_txt_style"
         android:layout_width="wrap_content"

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

@@ -25,5 +25,5 @@
         android:layout_gravity="center_horizontal"
         android:textSize="@dimen/text_size_15"
         android:textColor="@color/txt_black_565656"
-        android:text="平台自动完成任务"/>
+        android:text="@string/platform_auto_finish_task"/>
 </LinearLayout>

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

@@ -107,7 +107,7 @@
             android:id="@+id/detail_task_tv_center"
             style="@style/style_button_find"
             android:layout_centerInParent="true"
-            android:text="取消任务"
+            android:text="@string/task_cancel"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="@+id/item_icon_iv"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -213,21 +213,21 @@
                                 android:id="@+id/task_detail_reward"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="任务奖励"
+                                android:text="@string/task_benefit_limit"
                                 android:textSize="@dimen/text_size_2"
                                 android:layout_gravity="center_horizontal"
                                 android:textColor="@color/txt_black_818181"/>
                             <TextView
                                 android:id="@+id/task_detail_cancel"
                                 style="@style/style_button_find"
-                                android:text="取消任务"
+                                android:text="@string/task_cancel"
                                 android:textSize="@dimen/text_size_2"
                                 android:visibility="gone"/>
                             <TextView
                                 android:id="@+id/detail_task_tv"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="任务截图"
+                                android:text="@string/task_screenshot"
                                 android:minWidth="@dimen/view_size_73"
                                 android:textColor="@color/white"
                                 android:textSize="@dimen/text_size_12"
@@ -254,7 +254,7 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:text="邀请好友完成任务，可额外获取任务奖励的20%哦!"
+                            android:text="@string/tip_invite_for_more_coin_20_percent"
                             style="@style/nomal_txt_style_13"
                             android:layout_gravity="center_vertical"
                             android:gravity="center_vertical"
@@ -313,7 +313,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="任务说明"
+                        android:text="@string/task_description"
                         style="@style/nomal_txt_style"
                         android:layout_marginBottom="@dimen/content_padding_small"/>
 
@@ -338,7 +338,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="任务进度"
+                        android:text="@string/task_progress"
                         style="@style/nomal_txt_style"
                         android:layout_marginBottom="@dimen/content_padding_small"/>
 

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

@@ -40,7 +40,7 @@
             android:gravity="center"
             android:minWidth="@dimen/view_size_73"
             android:padding="@dimen/content_padding_3"
-            android:text="任务截图"
+            android:text="@string/task_screenshot"
             android:textColor="@color/black_444444"
             android:textSize="@dimen/text_size_12"
             android:visibility="visible" />
@@ -63,7 +63,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="2"
-            android:text="完成试玩任务无敌大航" />
+            android:text="完成试玩无敌大航" />
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -17,7 +17,7 @@
         android:id="@+id/tv_step"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="领取任务"
+        android:text="@string/get_task"
         android:textColor="@color/green"
         android:textSize="@dimen/text_size_3"/>
 

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

@@ -43,7 +43,7 @@
                 android:id="@+id/start_task_btntv"
                 style="@style/style_button_show"
                 android:layout_weight="1"
-                android:text="领取任务"/>
+                android:text="@string/get_task"/>
             <TextView
                 android:id="@+id/start_task_line"
                 style="@style/style_ash_line_tv"/>
@@ -51,7 +51,7 @@
                 android:id="@+id/down_task_btntv"
                 style="@style/style_button_show"
                 android:layout_weight="1"
-                android:text="下载任务"/>
+                android:text="@string/task_download"/>
             <TextView
                 android:id="@+id/down_task_line"
                 style="@style/style_ash_line_tv"/>
@@ -59,7 +59,7 @@
                 android:id="@+id/install_task_btntv"
                 style="@style/style_button_show"
                 android:layout_weight="1"
-                android:text="开始任务"/>
+                android:text="@string/task_start"/>
             <TextView
                 android:id="@+id/install_task_line"
                 style="@style/style_ash_line_tv"/>

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

@@ -77,7 +77,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:text="任务详情" />
+                    android:text="@string/task_detail" />
 
                 <TextView
                     android:id="@+id/item_remaining_time_tv"
@@ -160,7 +160,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/content_padding_15"
-                android:text="领取任务后可获得二维码"
+                android:text="@string/task_for_qrcode"
                 android:textColor="@color/gray"
                 android:textSize="@dimen/text_size_12"
                 app:layout_constraintTop_toBottomOf="@+id/qr_code_iv"

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

@@ -40,8 +40,11 @@
 
             <TextView
                 style="@style/style_ash_tv"
+                android:text="@string/task_flow" />
+            <TextView
+                style="@style/style_ash_tv"
                 android:layout_marginRight="@dimen/common_margin_10"
-                android:text="任务流程:" />
+                android:text=":" />
 
             <TextView
                 style="@style/style_ash_num"

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

@@ -174,7 +174,7 @@
             android:id="@+id/task_type_tv"
             style="@style/style_button_find"
             android:layout_marginTop="5dp"
-            android:text="取消任务"
+            android:text="@string/task_cancel"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/item_top_v" />
@@ -183,7 +183,7 @@
             android:id="@+id/detail_task_tv_center"
             style="@style/style_button_find"
             android:layout_centerInParent="true"
-            android:text="取消任务"
+            android:text="@string/task_cancel"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/item_icon_iv"
             app:layout_constraintEnd_toEndOf="parent"
@@ -235,12 +235,12 @@
                 <TextView
                     android:id="@+id/detail_task_tv"
                     style="@style/style_button_find"
-                    android:text="取消任务" />
+                    android:text="@string/task_cancel" />
 
                 <TextView
                     android:id="@+id/detail_task_tv_down"
                     style="@style/style_button_find"
-                    android:text="取消任务"
+                    android:text="@string/task_cancel"
                     android:visibility="gone" />
 
             </RelativeLayout>
@@ -255,7 +255,7 @@
         android:layout_marginEnd="12dp"
         android:background="@drawable/sp_rectangle_bg_gray_radius"
         android:padding="@dimen/content_padding_small"
-        android:text="若1小时35分22秒后任务未完成，该任务自动取消，您可以重新接受该任务"
+        android:text="@string/tip_finish_task_in_time_or_repeat"
         android:textColor="@color/txt_black_8e8e8e"
         android:textSize="@dimen/text_size_10"
         android:visibility="gone" />

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

@@ -60,7 +60,7 @@
             android:textColor="#eda6a6"
             android:textSize="10sp"
             android:visibility="gone"
-            tools:text="签到任务" />
+            tools:text="@string/checkin_task" />
 
         <TextView
             android:id="@+id/tv_reward"

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

@@ -15,7 +15,7 @@
             style="@style/nomal_txt_style"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="完成试玩任务无敌大航海"/>
+            android:text="完成试玩无敌大航海"/>
 
         <TextView
             android:id="@+id/date_tv"

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

@@ -23,7 +23,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="已领取任务奖励"
+        android:text="@string/got_task_benefit"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="@dimen/content_padding_15"
         android:textSize="@dimen/text_size_15"

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

@@ -69,7 +69,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:gravity="start"
-            android:text="点击下方分享给好友(享受任务奖励提成):"
+            android:text="@string/tip_click_share_get_benefit_percent"
             android:textColor="@color/txt_black_cc444444"
             android:textSize="10sp" />
 
@@ -200,7 +200,7 @@
         android:layout_marginStart="10dp"
         android:layout_marginTop="5dp"
         android:layout_marginEnd="10dp"
-        android:text="注：通过链接加入小绵羊即为你的好友下线，好友完成任务你可以额外获得20%的提成奖励哦!"
+        android:text="@string/tip_you_can_get_20_percent_from_your_friend"
         android:textColor="@color/txt_black_cc444444"
         android:textSize="@dimen/text_size_12" />
 </merge>