可以修改挂机微信账号密码或提交验证码

app/src/main/AndroidManifest.xml

@@ -204,7 +204,8 @@
         <activity android:name="com.sheep.gamegroup.view.activity.WithdrawalResultAct"/>
         <activity android:name="com.sheep.gamegroup.view.activity.BindOrChangeWeixinAct"/>
         <activity android:name="com.sheep.gamegroup.view.activity.TryMakeMoneyact"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.LieMakeMoneyAct"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.LieMakeMoneyAct"
+            android:launchMode="singleTask"/>
         <activity android:name="com.sheep.gamegroup.view.activity.HomePageAct"/>
         <activity android:name="com.sheep.gamegroup.view.activity.BindDataAct"/>
         <activity android:name="com.sheep.gamegroup.view.activity.DialogActivity"
@@ -323,6 +324,7 @@
             android:configChanges="orientation|keyboardHidden|screenSize"/>
         <activity android:name="com.sheep.gamegroup.view.activity.CommitWxAct" />
         <activity android:name="com.sheep.gamegroup.view.activity.ActGuideOnHook" />
+        <activity android:name="com.sheep.gamegroup.view.activity.CommitWxCodeAct" />
 
 
         <!--友盟start-->

app/src/main/java/com/sheep/gamegroup/di/components/CommitWxCodeMakeMoneyComponent.java

@@ -0,0 +1,17 @@
+package com.sheep.gamegroup.di.components;
+
+import com.sheep.gamegroup.di.modules.CommitWxCodeMakeMoneyModule;
+import com.sheep.gamegroup.di.scopes.UserScope;
+import com.sheep.gamegroup.view.activity.CommitWxCodeAct;
+
+import dagger.Component;
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+@UserScope
+@Component(modules = CommitWxCodeMakeMoneyModule.class, dependencies = NetComponent.class)
+public interface CommitWxCodeMakeMoneyComponent {
+    void inject(CommitWxCodeAct commitWxCodeAct);
+}

app/src/main/java/com/sheep/gamegroup/di/modules/CommitWxCodeMakeMoneyModule.java

@@ -0,0 +1,24 @@
+package com.sheep.gamegroup.di.modules;
+
+
+import com.sheep.gamegroup.presenter.CommitWxCodeMakeMoneyContract;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+@Module
+public class CommitWxCodeMakeMoneyModule {
+    private CommitWxCodeMakeMoneyContract.View view;
+
+    public CommitWxCodeMakeMoneyModule(CommitWxCodeMakeMoneyContract.View view) {
+        this.view = view;
+    }
+    @Provides
+    public CommitWxCodeMakeMoneyContract.View provideView(){
+        return view;
+    }
+}

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -16,6 +16,7 @@ import retrofit2.http.GET;
 import retrofit2.http.Header;
 import retrofit2.http.POST;
 import retrofit2.http.PUT;
+import retrofit2.http.Path;
 import retrofit2.http.Query;
 import retrofit2.http.QueryMap;
 import retrofit2.http.Streaming;
@@ -56,13 +57,18 @@ public interface ApiService {
     /**
      * 获取用户的已经挂机微信
      */
-    @GET(V1+"/app/wechat/")
+    @GET(V1+"app/wechat/")
     Observable<BaseMessage> getWebchat();
     /**
      * 提交用户的微信账号与密码
      */
-    @POST(V1+"/app/wechat/")
+    @POST(V1+"app/wechat/")
     Observable<BaseMessage> postWebchat(@Body JSONObject jsonObject);
+    /**
+     * 提交用户的微信账号与密码
+     */
+    @PUT(V1+"app/wechat/{id}")
+    Observable<BaseMessage> putWebchat(@Path("id") int id, @Body JSONObject jsonObject);
 
     /**
      * 绑定手机号

app/src/main/java/com/sheep/gamegroup/presenter/CommitWxCodeMakeMoneyContract.java

@@ -0,0 +1,21 @@
+package com.sheep.gamegroup.presenter;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+
+public interface CommitWxCodeMakeMoneyContract {
+    interface Presenter{
+        void putWebchat(int id, JSONObject jsonObject);//提交微信验证码
+    }
+    interface View{
+
+        void putWebchatUpdataView(BaseMessage baseMessage);
+        void failPutWebchat2View(BaseMessage baseMessage);
+    }
+}

app/src/main/java/com/sheep/gamegroup/presenter/CommitWxCodeMakeMoneyPresenter.java

@@ -0,0 +1,46 @@
+package com.sheep.gamegroup.presenter;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+
+import javax.inject.Inject;
+
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+
+public class CommitWxCodeMakeMoneyPresenter implements CommitWxCodeMakeMoneyContract.Presenter {
+    private CommitWxCodeMakeMoneyContract.View view;
+    private ApiService apiService;
+    @Inject
+    public CommitWxCodeMakeMoneyPresenter(CommitWxCodeMakeMoneyContract.View view, ApiService apiService) {
+        this.view = view;
+        this.apiService = apiService;
+    }
+
+    @Override
+    public void putWebchat(int id, JSONObject jsonObject) {
+        apiService.putWebchat(id, jsonObject)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        view.failPutWebchat2View(baseMessage);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        view.putWebchatUpdataView(baseMessage);
+
+                    }
+                });
+    }
+}

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

@@ -6,6 +6,7 @@ import android.content.Intent;
 import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.bean.KFIntentKeys;
 import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.model.entity.WXOnHookAccount;
 import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
 import com.sheep.gamegroup.view.activity.ActGuideOnHook;
 import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
@@ -13,6 +14,7 @@ import com.sheep.gamegroup.view.activity.AuthenticationAct;
 import com.sheep.gamegroup.view.activity.BindDataAct;
 import com.sheep.gamegroup.view.activity.BindOrChangeWeixinAct;
 import com.sheep.gamegroup.view.activity.CommitWxAct;
+import com.sheep.gamegroup.view.activity.CommitWxCodeAct;
 import com.sheep.gamegroup.view.activity.DialogActivity;
 import com.sheep.gamegroup.view.activity.LieMakeMoneyAct;
 import com.sheep.gamegroup.view.activity.LoginAct;
@@ -171,7 +173,19 @@ public class Jump2View {
         context.startActivity(intent);
     }
     /**
-     * 跳到提交微信号挂机赚钱界面
+     * 跳到提交挂机微信验证码界面
+     * @param context
+     * @param wxOnHookAccount
+     */
+    public void goCommitWxCodeOnHookView(Context context, WXOnHookAccount wxOnHookAccount, int type){
+        Intent intent = new Intent(context, CommitWxCodeAct.class);
+        intent.putExtra("type", type);
+        intent.putExtra("id", wxOnHookAccount.getId());
+        intent.putExtra("account", wxOnHookAccount.getAccount());
+        context.startActivity(intent);
+    }
+    /**
+     * 跳到引导用户添加微信小号H5界面
      * @param context
      * @param o
      */
@@ -184,6 +198,19 @@ public class Jump2View {
         context.startActivity(intent);
     }
     /**
+     * 跳到引导用户解封微信小号H5界面
+     * @param context
+     * @param o
+     */
+    public void goGuideDeArchive(Context context, Object o){
+        Intent intent = new Intent(context, ActGuideOnHook.class);
+//        extraUrl = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_URL);
+//        extraTitle = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE);
+        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_URL, "https://qiniu.kuaifazs.com/weixin.html");
+        intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE, "解封引导");
+        context.startActivity(intent);
+    }
+    /**
      * 跳到提交微信号挂机赚钱界面
      * @param context
      * @param o

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

@@ -11,6 +11,7 @@ import com.sheep.gamegroup.di.modules.CommitWxMakeMoneyModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.presenter.CommitWxMakeMoneyContract;
 import com.sheep.gamegroup.presenter.CommitWxMakeMoneyPresenter;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -48,6 +49,7 @@ public class CommitWxAct extends BaseActivity implements CommitWxMakeMoneyContra
                 } else if(TextUtils.isEmpty(password)){
                     G.showToast("微信密码不能为空");
                 } else if(presenter != null) {
+                    showProgress();
                     presenter.postWebchat(account, password);
                 } else {
                     if(BuildConfig.DEBUG) G.showToast("功能不正常");
@@ -91,11 +93,14 @@ public class CommitWxAct extends BaseActivity implements CommitWxMakeMoneyContra
 
     @Override
     public void postWebchatUpdataView(BaseMessage baseMessage) {
-        G.showToast(baseMessage);
+        hideProgress();
+        G.showToast(baseMessage.getData().toString());//提示信息在data里面
+        Jump2View.getInstance().goLyingView(this, null);
     }
 
     @Override
     public void failPostWebchat2View(BaseMessage baseMessage) {
+        hideProgress();
         G.showToast(baseMessage);
     }
 }

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

@@ -0,0 +1,149 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.app.Activity;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.di.components.DaggerCommitWxCodeMakeMoneyComponent;
+import com.sheep.gamegroup.di.components.DaggerCommitWxMakeMoneyComponent;
+import com.sheep.gamegroup.di.modules.CommitWxCodeMakeMoneyModule;
+import com.sheep.gamegroup.di.modules.CommitWxMakeMoneyModule;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.WXOnHookAccount;
+import com.sheep.gamegroup.presenter.CommitWxCodeMakeMoneyContract;
+import com.sheep.gamegroup.presenter.CommitWxCodeMakeMoneyPresenter;
+import com.sheep.gamegroup.presenter.CommitWxMakeMoneyContract;
+import com.sheep.gamegroup.presenter.CommitWxMakeMoneyPresenter;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ * 提交微信验证码
+ */
+
+public class CommitWxCodeAct extends BaseActivity implements CommitWxCodeMakeMoneyContract.View{
+     public static final int ALTER_CODE = 0;//修改验证码
+     public static final int ALTER_INFO = 1;//修改验证码
+    @BindView(R.id.tv_wx_commit)
+    TextView tv_wx_commit;
+    @BindView(R.id.et_wx_account)
+    EditText et_wx_account;
+    @BindView(R.id.et_wx_pwd)
+    EditText et_wx_pwd;
+    private int id;
+    private int type;
+
+    @OnClick({R.id.tv_wx_commit})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_wx_commit:
+                String account = et_wx_account.getText().toString();
+                String password = et_wx_pwd.getText().toString();
+                if(TextUtils.isEmpty(account)){
+                    G.showToast("微信账号不能为空");
+                } else if(TextUtils.isEmpty(password)){
+                    switch (type){
+                        case ALTER_CODE:
+                            G.showToast("微信验证码不能为空");
+                            break;
+                        case ALTER_INFO:
+                            G.showToast("微信密码不能为空");
+                            break;
+                    }
+                } else if(presenter != null) {
+                    showProgress();
+                    JSONObject jsonObject = new JSONObject();
+                    switch (type){
+                        case ALTER_CODE:
+                            jsonObject.put("verification_code", password);
+                            presenter.putWebchat(id, jsonObject);
+                            break;
+                        case ALTER_INFO:
+                            jsonObject.put("account", account);
+                            jsonObject.put("password", password);
+                            presenter.putWebchat(id, jsonObject);
+                            break;
+                    }
+                } else {
+                    if(BuildConfig.DEBUG) G.showToast("功能不正常");
+                }
+                break;
+        }
+    }
+    @Inject
+    CommitWxCodeMakeMoneyPresenter presenter;
+
+    private Activity activity;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.commit_wx_make_money;
+    }
+
+    @Override
+    public void initView() {
+        ButterKnife.bind(this);
+        activity = this;
+        id = getIntent().getIntExtra("id", 0);
+        type = getIntent().getIntExtra("type", 0);
+        String account = getIntent().getStringExtra("account");
+        et_wx_account.setText(account);
+        String title = "提交验证码";
+        switch (type){
+            case ALTER_CODE:
+                et_wx_account.setEnabled(false);
+                et_wx_pwd.setHint("请输入微信验证码");
+                break;
+            case ALTER_INFO:
+                title = "修改挂机微信信息";
+                break;
+        }
+        TitleBarUtils.getInstance()
+                .setTitle(activity, title)
+                .setTitleFinish(activity);
+        DaggerCommitWxCodeMakeMoneyComponent.builder()
+                .netComponent(SheepApp.get(this).getNetComponent())
+                .commitWxCodeMakeMoneyModule(new CommitWxCodeMakeMoneyModule(this))
+                .build()
+                .inject(this);
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+
+    }
+
+    @Override
+    public void putWebchatUpdataView(BaseMessage baseMessage) {
+        hideProgress();
+        G.showToast(baseMessage.getData().toString());//提示信息在data里面
+        Jump2View.getInstance().goLyingView(this, null);
+    }
+
+    @Override
+    public void failPutWebchat2View(BaseMessage baseMessage) {
+        hideProgress();
+        G.showToast(baseMessage);
+    }
+}

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

@@ -14,6 +14,7 @@ import com.sheep.gamegroup.model.entity.WXOnHookAccount;
 import com.sheep.gamegroup.presenter.LieMakeMoneyContract;
 import com.sheep.gamegroup.presenter.LieMakeMoneyPresenter;
 import com.sheep.gamegroup.view.adapter.LieMakeMoneyAdp;
+import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -116,6 +117,7 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
     public void getWebchatUpdataView(BaseMessage baseMessage) {
         List<WXOnHookAccount> list = baseMessage.getDatas(WXOnHookAccount.class);
         lieMakeMoneyAdp.clear();
+        boolean hasWxAccountAbnormal = false;
         for (WXOnHookAccount wxOnHookAccount : list) {
             switch (wxOnHookAccount.getStatus()) {
                 case 0://未验证
@@ -132,12 +134,19 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
                 case 7://验证码超时
                 default:
                     lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.ABNORMAL_ON_HOOK, wxOnHookAccount));
+                    hasWxAccountAbnormal = true;
                     break;
             }
         }
         lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.PROMPT_ON_HOOK, list));
         lieMakeMoneyAdp.notifyDataSetChanged();
+        if(!hadShowDialogAccountAbnormal && hasWxAccountAbnormal){//有微信账号状态异常
+            hadShowDialogAccountAbnormal = true;
+            //弹出账号异常对话框
+            DialogAccountAbnormal.showDialog(this);
+        }
     }
+    private boolean hadShowDialogAccountAbnormal = false;
 
     @Override
     public void failGetWebchat2View(BaseMessage baseMessage) {

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

@@ -148,10 +148,6 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
                 getCaptcha();
                 break;
             case R.id.phone_sure_tv:
-                if(BuildConfig.DEBUG){
-                    goMain();
-                    return;
-                }
                 etPhone = phoneEtAccount.getText().toString().trim();
                 etCode = phoneEtCode.getText().toString().trim();
                 loginByPhoneGaptcha();

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

@@ -2,23 +2,17 @@ package com.sheep.gamegroup.view.adapter;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
-import android.view.LayoutInflater;
+import android.text.TextUtils;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
-import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
-import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.entity.WXOnHookAccount;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ViewHolder;
+import com.sheep.gamegroup.view.activity.CommitWxCodeAct;
 import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
@@ -104,33 +98,59 @@ public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
         TextView wx_is_open_tv = holder.getView(R.id.wx_is_open_tv);
         TextView earnings_name_tv = holder.getView(R.id.earnings_name_tv);
         weixin_name_tv.setText(dataObjT.getAccount());
+        if(TextUtils.isEmpty(dataObjT.getRemarks())){
+            wx_is_open_tv.setText("账号异常，请联系客服");
+        } else {
+            wx_is_open_tv.setText(dataObjT.getRemarks());
+        }
         switch (dataObjT.getStatus()) {
             case 2://需要用户验证码
                 earnings_name_tv.setText("需要用户验证码");
                 break;
-            case 3://用户已经验证等待脚本验证
-                earnings_name_tv.setText("等待服务器验证");
-                break;
-            case 4://被封
+            case 3://被封
                 earnings_name_tv.setText("账号被封");
                 break;
-            case 5://用户已经解封等待脚本验证
-                earnings_name_tv.setText("等待验证");
+            case 4://用户已经解封等待脚本验证
+                earnings_name_tv.setText("等待服务器验证");
                 break;
-            case 6://账号异常
+            case 5://账号异常
                 earnings_name_tv.setText("账号异常");
                 break;
-            case 7://验证码超时
+            case 6://验证码超时请重新上传
                 earnings_name_tv.setText("验证码超时");
                 break;
+            case 7://用户已经验证等待脚本验证
+                earnings_name_tv.setText("等待服务器验证");
+                break;
             default:
                 earnings_name_tv.setText("账号异常");
                 break;
         }
-        wx_is_open_tv.setText(dataObjT.getRemarks());
         //TODO 各种状态用户可以进行不同的操作
         wx_is_open_tv.setOnClickListener(view -> {
-            G.showToast("请联系客服："+dataObjT.getCustomer_service());
+            switch (dataObjT.getStatus()) {
+                case 2://需要用户验证码
+                case 6://验证码超时请重新上传
+                    //修改验证码
+                    Jump2View.getInstance().goCommitWxCodeOnHookView(this.context, dataObjT, CommitWxCodeAct.ALTER_CODE);
+                    break;
+                case 5://账号异常
+                    //修改用户信息
+                    Jump2View.getInstance().goCommitWxCodeOnHookView(this.context, dataObjT, CommitWxCodeAct.ALTER_INFO);
+                    break;
+                case 3://被封
+                    if (context instanceof Activity){
+                        DialogAccountAbnormal.showDialog((Activity) context);
+                    }else if(BuildConfig.DEBUG) {
+                        G.showToast("context不是activity，无法弹出对话框!");
+                    }
+                    break;
+                case 4://用户已经解封等待脚本验证
+                case 7://用户已经验证等待脚本验证
+                default:
+                    G.showToast("请等待或者联系客服："+dataObjT.getCustomer_service());
+                    break;
+            }
         });
     }
 
@@ -145,16 +165,13 @@ public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
             Jump2View.getInstance().goGuideOnHook(this.context, null);
         });
     }
+
     private void bindPromptOnHook(ViewHolder holder,  List<WXOnHookAccount> list) {
         View ll = holder.getView(R.id.lie_make_operation_ll);
         ll.setVisibility(list != null ? View.VISIBLE : View.GONE);
-        ll.findViewById(R.id.account_abnormal_tv).setOnClickListener(view -> {
-//            // 点击账号异常，弹出账号异常对话框
-//            G.showToast("该功能正在建设中");
-            if(context instanceof Activity)
-                DialogAccountAbnormal.showDialog((Activity) context);
-            else if(BuildConfig.DEBUG)
-                G.showToast("传入的context不是activity，无法弹出对话框");
+        ll.findViewById(R.id.start_on_hook_tv).setOnClickListener(view -> {
+            // 点击添加挂机账号,进入引导小号界面
+            Jump2View.getInstance().goGuideOnHook(this.context, null);
         });
         ll.findViewById(R.id.customer_service_name_tv).setOnClickListener(view -> {
 //            // 点击联系客服

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

@@ -6,6 +6,7 @@ import android.view.View;
 
 import com.kfzs.duanduan.utils.dlg.HelperUtils;
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -35,7 +36,7 @@ public class DialogAccountAbnormal {
                         @Override
                         public void onClick(View v) {
                             mAlertDialog.dismiss();
-                            G.showToast("该功能正在建设中");
+                            Jump2View.getInstance().goGuideDeArchive(activity, null);
                         }
                     });
             mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)

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

@@ -75,10 +75,6 @@ public class G {
         showToast(SheepApp.mSheepApp, SheepApp.mSheepApp.getString(resId), Toast.LENGTH_SHORT);
     }
     public static void showToast(BaseMessage baseMessage) {
-        if(baseMessage.getCode() == 0){//成功
-            G.showToast(JSON.toJSONString(baseMessage.getData()));
-        } else {
-            G.showToast(baseMessage.getMsg() + (BuildConfig.DEBUG ? "[" + baseMessage.getCode() + "]" : ""));
-        }
+        G.showToast(baseMessage.getMsg() + (BuildConfig.DEBUG ? "[" + baseMessage.getCode() + "]" : ""));
     }
 }

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

@@ -7,7 +7,7 @@
     android:layout_marginBottom="20dp"
     android:orientation="vertical">
     <TextView
-        android:id="@+id/account_abnormal_tv"
+        android:id="@+id/start_on_hook_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/shape_btn_account_abnormal"
@@ -17,7 +17,7 @@
         android:paddingRight="15dp"
         android:textSize="@dimen/text_size_15"
         android:textColor="@color/white"
-        android:text="账号异常"/>
+        android:text="添加挂机账号"/>
     <TextView
         android:id="@+id/customer_service_name_tv"
         android:layout_width="wrap_content"

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

@@ -23,7 +23,7 @@
         android:drawableLeft="@drawable/shape_small_black_oval"
         android:drawablePadding="5dp"
         app:isAliganCenter="false"
-        android:text="投机收益每日早上9点结算。" />
+        android:text="挂机收益每日早上9点结算。" />
     <com.hedan.textdrawablelibrary.TextViewDrawable
         style="@style/hint_txt_style"
         android:layout_width="wrap_content"