添加挂机账号成功

.idea/gradle.xml

@@ -5,6 +5,14 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/datashare" />
+            <option value="$PROJECT_DIR$/view" />
+          </set>
+        </option>
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>

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

@@ -62,7 +62,7 @@ public interface ApiService {
      * 提交用户的微信账号与密码
      */
     @POST(V1+"/app/wechat/")
-    Observable<BaseMessage> postWebchat(@Query("account") String account, @Query("password") String password);
+    Observable<BaseMessage> postWebchat(@Body JSONObject jsonObject);
 
     /**
      * 绑定手机号

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

@@ -73,10 +73,11 @@ public class BaseMessage {
      * @return
      */
     public <T> List<T> getDatas(Class<T> clazz) {
-        if (object == null) {
+        if (data == null) {
             return null;
         }
-        return JSONArray.parseArray(JSONObject.toJSONString(object), clazz);
+        String json = JSONArray.toJSONString(data);
+        return JSONArray.parseArray(json, clazz);
     }
 
     @Override

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

@@ -0,0 +1,145 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * Created by realicing on 2018/3/24.
+ * realicing@sina.com
+ * { "id": 14, "Uid": 12, "account": "trhhccg","money": 12, "customer_service": "trhhccg", "password": "", "verification_code": "", "status": 0, "remarks": "", "normal_time": 0, "create_time": 1521854985, "update_time": 0, "phone_number": "17628083502", "is_send": 0, "device_info": null }
+ */
+public class WXOnHookAccount {
+
+    private int id;
+    private int Uid;
+    private String account;
+    private String password;
+    private String verification_code;
+    private int status;
+    private String customer_service;
+    private int money;
+    private String remarks;
+    private int normal_time;
+    private long create_time;
+    private int update_time;
+    private String phone_number;
+    private int is_send;
+    private String device_info;
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setUid(int Uid) {
+        this.Uid = Uid;
+    }
+
+    public int getUid() {
+        return Uid;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setVerification_code(String verification_code) {
+        this.verification_code = verification_code;
+    }
+
+    public String getVerification_code() {
+        return verification_code;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setNormal_time(int normal_time) {
+        this.normal_time = normal_time;
+    }
+
+    public int getNormal_time() {
+        return normal_time;
+    }
+
+    public void setCreate_time(long create_time) {
+        this.create_time = create_time;
+    }
+
+    public long getCreate_time() {
+        return create_time;
+    }
+
+    public void setUpdate_time(int update_time) {
+        this.update_time = update_time;
+    }
+
+    public int getUpdate_time() {
+        return update_time;
+    }
+
+    public void setPhone_number(String phone_number) {
+        this.phone_number = phone_number;
+    }
+
+    public String getPhone_number() {
+        return phone_number;
+    }
+
+    public void setIs_send(int is_send) {
+        this.is_send = is_send;
+    }
+
+    public int getIs_send() {
+        return is_send;
+    }
+
+    public void setDevice_info(String device_info) {
+        this.device_info = device_info;
+    }
+
+    public String getDevice_info() {
+        return device_info;
+    }
+
+    public void setMoney(int money) {
+        this.money = money;
+    }
+
+    public int getMoney() {
+        return money;
+    }
+
+    public String getCustomer_service() {
+        return customer_service;
+    }
+
+    public void setCustomer_service(String customer_service) {
+        this.customer_service = customer_service;
+    }
+}

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

@@ -1,5 +1,6 @@
 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.ExceptionHandle;
@@ -27,7 +28,10 @@ public class CommitWxMakeMoneyPresenter implements CommitWxMakeMoneyContract.Pre
 
     @Override
     public void postWebchat(String account, String password) {
-        apiService.getWebchat()
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("account", account);
+        jsonObject.put("password", password);
+        apiService.postWebchat(jsonObject)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {

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

@@ -6,8 +6,8 @@ package com.sheep.gamegroup.util;
 
 public class ConnectAddress {
 
-//    public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
-     public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
+    public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
+//     public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
 //    public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
 
     public static final String V1 = "/v1/";

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

@@ -17,6 +17,7 @@ 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.TaskReleaseEty;
+import com.sheep.gamegroup.model.entity.WXOnHookAccount;
 import com.sheep.gamegroup.presenter.LieMakeMoneyContract;
 import com.sheep.gamegroup.presenter.LieMakeMoneyPresenter;
 import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
@@ -25,6 +26,7 @@ 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.page.entry.WXAccount;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
@@ -49,14 +51,6 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
     private LieMakeMoneyAdp lieMakeMoneyAdp;
     @Inject
     LieMakeMoneyPresenter presenter;
-    Handler mhandler = new Handler(){
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-
-            lieMakeMoneyAdp.notifyDataSetChanged();
-        }
-    };
 
     @Override
     protected int getLayoutId() {
@@ -79,7 +73,7 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
         recyclerview.setLayoutManager(new LinearLayoutManager(activity));
         lieMakeMoneyAdp = new LieMakeMoneyAdp(this);
         lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.START_ON_HOOK, null));
-        lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.PROMPT_ON_HOOK, false));
+        lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.PROMPT_ON_HOOK, false));//true代表有数据,false代表无数据
         recyclerview.setAdapter(lieMakeMoneyAdp);
     }
 
@@ -116,10 +110,32 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
         }
         presenter.getWebchat();
     }
-
+    //{ "data": [ { "id": 14, "Uid": 12, "account": "trhhccg", "password": "", "verification_code": "", "status": 0, "remarks": "", "normal_time": 0, "create_time": 1521854985, "update_time": 0, "phone_number": "17628083502", "is_send": 0, "device_info": null } ] }
     @Override
     public void getWebchatUpdataView(BaseMessage baseMessage) {
-        G.showToast(baseMessage);
+        List<WXOnHookAccount> list = baseMessage.getDatas(WXOnHookAccount.class);
+        lieMakeMoneyAdp.clear();
+        for (WXOnHookAccount wxOnHookAccount : list) {
+            switch (wxOnHookAccount.getStatus()) {
+                case 0://未验证
+                    lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.PROCESS_ON_HOOK, wxOnHookAccount));
+                    break;
+                case 1://正常（脚本验证成功）
+                    lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.NORMAL_ON_HOOK, wxOnHookAccount));
+                    break;
+                case 2://需要用户验证码
+                case 3://用户已经验证等待脚本验证
+                case 4://被封
+                case 5://用户已经解封等待脚本验证
+                case 6://账号异常
+                case 7://验证码超时
+                default:
+                    lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.ABNORMAL_ON_HOOK, wxOnHookAccount));
+                    break;
+            }
+        }
+        lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.PROMPT_ON_HOOK, true));//true代表有数据,false代表无数据
+        lieMakeMoneyAdp.notifyDataSetChanged();
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 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;
@@ -15,8 +16,11 @@ 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.dialog.DialogAccountAbnormal;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -27,7 +31,6 @@ import java.util.List;
  * realicing@sina.com
  */
 public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
-    private final static int TAG_ID_TEMP = R.id.view_tag_1;
 
     public LieMakeMoneyAdp(Context context) {
         super(context);
@@ -69,10 +72,10 @@ public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 bindAbnormalOnHook(holder, recyleObj.getDataObjT());
                 break;
             case NORMAL_ON_HOOK:
-                bindAbnormalOnHook(holder, recyleObj.getDataObjT());
+                bindNormalOnHook(holder, recyleObj.getDataObjT());
                 break;
             case PROCESS_ON_HOOK:
-                bindAbnormalOnHook(holder, recyleObj.getDataObjT());
+                bindProcessOnHook(holder, recyleObj.getDataObjT());
                 break;
             case PROMPT_ON_HOOK:
                 bindPromptOnHook(holder, recyleObj.getDataObjT());
@@ -80,7 +83,55 @@ public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
         }
     }
 
-    private void bindAbnormalOnHook(ViewHolder holder, Object dataObjT) {
+    private void bindProcessOnHook(ViewHolder holder, WXOnHookAccount dataObjT) {
+        TextView weixin_name_tv = holder.getView(R.id.weixin_name_tv);
+        TextView customer_service_name_tv = holder.getView(R.id.customer_service_name_tv);
+        weixin_name_tv.setText(dataObjT.getAccount());
+        customer_service_name_tv.setOnClickListener(view -> {
+            G.showToast("请联系客服："+dataObjT.getCustomer_service());
+        });
+    }
+
+    private void bindNormalOnHook(ViewHolder holder, WXOnHookAccount dataObjT) {
+        TextView weixin_name_tv = holder.getView(R.id.weixin_name_tv);
+        TextView earnings_money_tv = holder.getView(R.id.earnings_money_tv);
+        weixin_name_tv.setText(dataObjT.getAccount());
+        earnings_money_tv.setText(dataObjT.getMoney());
+    }
+
+    private void bindAbnormalOnHook(ViewHolder holder, WXOnHookAccount dataObjT) {
+        TextView weixin_name_tv = holder.getView(R.id.weixin_name_tv);
+        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());
+        switch (dataObjT.getStatus()) {
+            case 2://需要用户验证码
+                earnings_name_tv.setText("需要用户验证码");
+                break;
+            case 3://用户已经验证等待脚本验证
+                earnings_name_tv.setText("等待服务器验证");
+                break;
+            case 4://被封
+                earnings_name_tv.setText("账号被封");
+                break;
+            case 5://用户已经解封等待脚本验证
+                earnings_name_tv.setText("等待验证");
+                break;
+            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());
+        });
     }
 
     @Override
@@ -98,8 +149,12 @@ public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
         View ll = holder.getView(R.id.lie_make_operation_ll);
         ll.setVisibility(hasData ? View.VISIBLE : View.GONE);
         ll.findViewById(R.id.account_abnormal_tv).setOnClickListener(view -> {
-            //TODO 账号解封
-            G.showToast("该功能正在建设中");
+//            // 点击账号异常，弹出账号异常对话框
+//            G.showToast("该功能正在建设中");
+            if(context instanceof Activity)
+                DialogAccountAbnormal.showDialog((Activity) context);
+            else if(BuildConfig.DEBUG)
+                G.showToast("传入的context不是activity，无法弹出对话框");
         });
     }
 

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

@@ -0,0 +1,52 @@
+package com.sheep.gamegroup.view.dialog;
+
+import android.app.Activity;
+import android.support.v7.app.AlertDialog;
+import android.view.View;
+
+import com.kfzs.duanduan.utils.dlg.HelperUtils;
+import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
+public class DialogAccountAbnormal {
+
+    private static AlertDialog mAlertDialog;
+
+    public static AlertDialog showDialog(final Activity activity) {
+        if (mAlertDialog == null) {
+            View view = View.inflate(activity, R.layout.diag_account_abnormal, null);
+            ViewFindUtils.find(view, R.id.dialog_sure)
+                    .setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            mAlertDialog.dismiss();
+                        }
+                    });
+            ViewFindUtils.find(view, R.id.dialog_close)
+                    .setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            mAlertDialog.dismiss();
+                        }
+                    });
+            ViewFindUtils.find(view, R.id.dialog_action)
+                    .setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            mAlertDialog.dismiss();
+                            G.showToast("该功能正在建设中");
+                        }
+                    });
+            mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+                    .setView(view)
+                    .create();
+        }
+        if (!HelperUtils.isActivityOnTop(activity)) {
+            return mAlertDialog;//如果不是顶层窗口，那就不显示了。
+        }
+
+        mAlertDialog.show();
+        return mAlertDialog;
+    }
+}

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

@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.alibaba.fastjson.JSON;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -74,6 +75,10 @@ public class G {
         showToast(SheepApp.mSheepApp, SheepApp.mSheepApp.getString(resId), Toast.LENGTH_SHORT);
     }
     public static void showToast(BaseMessage baseMessage) {
-        G.showToast(baseMessage.getMsg()+(BuildConfig.DEBUG ? "["+baseMessage.getCode()+"]":""));
+        if(baseMessage.getCode() == 0){//成功
+            G.showToast(JSON.toJSONString(baseMessage.getData()));
+        } else {
+            G.showToast(baseMessage.getMsg() + (BuildConfig.DEBUG ? "[" + baseMessage.getCode() + "]" : ""));
+        }
     }
 }

app/src/main/res/drawable/shape_black_ring.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval" >
+<!--70%透明度-->
+    <stroke android:color="#b2000000"
+        android:width="3dp"/>
+
+    <corners android:radius="10dp" />
+</shape>

app/src/main/res/drawable/sp_bg_gradient_rectangle_yellow2.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:startColor="@color/yellow2_start"
+        android:endColor="@color/yellow2_end"/>
+    <corners
+        android:radius="@dimen/radius_20"/>
+</shape>

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

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_margin="@dimen/content_padding_10"
+                android:padding="@dimen/content_padding_20"
+                android:gravity="center"
+                android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
+
+                <TextView
+                    style="@style/txt_big_noheight_style"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#000000"
+                    android:textSize="@dimen/text_size_15"
+                    android:text="挂机账号异常" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/content_padding_15"
+                    android:lineSpacingExtra="@dimen/content_padding_8"
+                    android:text="你的微信号由于没有实名认证，频繁进入游戏，已被微信封禁。请登录该微信号，完成自助解封后点击“已解封，继续赚钱”，小绵羊会继续帮你干活赚钱（已实名认证的不会再被微信封禁）。"
+                    android:textColor="#404040"
+                    android:textSize="@dimen/text_size_12" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="@dimen/content_padding_10"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:id="@+id/dialog_action"
+                        android:layout_width="0dp"
+                        android:layout_weight="5"
+                        android:layout_height="40dp"
+                        android:background="@drawable/sp_bg_gradient_rectangle_green"
+                        android:gravity="center"
+                        android:text="了解如何解封"
+                        android:textColor="#010101"
+                        android:textSize="@dimen/text_size_12" />
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"/>
+                    <TextView
+                        android:id="@+id/dialog_sure"
+                        android:layout_width="0dp"
+                        android:layout_weight="5"
+                        android:layout_height="40dp"
+                        android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
+                        android:gravity="center"
+                        android:text="确定"
+                        android:textColor="#010101"
+                        android:textSize="@dimen/text_size_15" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/dialog_close"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:padding="2dp"
+                android:layout_alignParentEnd="true"
+                android:src="@mipmap/try_dialog_x"
+                android:background="@drawable/shape_black_ring"/>
+        </RelativeLayout>
+</FrameLayout>

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

@@ -74,7 +74,7 @@
             android:minWidth="151dp"
             android:text="领取奖励"
             android:textSize="18sp"
-            android:background="@drawable/sp_bg_gradient_rectqangle_yellow"
+            android:background="@drawable/sp_bg_gradient_rectangle_yellow"
             app:layout_constraintTop_toBottomOf="@+id/start_stask_sprogress"
             android:gravity="center"
             app:layout_constraintBaseline_toBaselineOf="parent"

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

@@ -115,7 +115,7 @@
                         android:layout_marginLeft="@dimen/content_padding_40"
                         android:layout_marginRight="@dimen/content_padding_40"
                         android:layout_marginTop="@dimen/content_padding_small"
-                        android:background="@drawable/sp_bg_gradient_rectqangle_yellow"
+                        android:background="@drawable/sp_bg_gradient_rectangle_yellow"
                         android:gravity="center"
                         android:minHeight="36dp"
                         android:minWidth="151dp"
@@ -132,7 +132,7 @@
                     android:layout_marginLeft="@dimen/content_padding_40"
                     android:layout_marginRight="@dimen/content_padding_40"
                     android:layout_marginTop="@dimen/content_padding_small"
-                    android:background="@drawable/sp_bg_gradient_rectqangle_yellow"
+                    android:background="@drawable/sp_bg_gradient_rectangle_yellow"
                     android:gravity="center"
                     android:minHeight="36dp"
                     android:minWidth="151dp"

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

@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:padding="@dimen/content_padding_15">
+    android:padding="@dimen/content_padding_20"
+    android:layout_margin="@dimen/content_padding_10">
 
     <TextView
         android:id="@+id/state_name_tv"
         style="@style/txt_style_15"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="账号异常"
-        tools:layout_editor_absoluteX="0dp"
-        tools:layout_editor_absoluteY="0dp" />
+        android:text="账号处理中"
+        app:layout_constraintLeft_toLeftOf="parent" />
     <TextView
         android:id="@+id/weixin_number_tv"
         android:layout_width="wrap_content"
@@ -22,7 +21,8 @@
         android:text="微信号"
         style="@style/nomal_txt_style"
         app:layout_constraintTop_toBottomOf="@+id/state_name_tv"
-        tools:layout_editor_absoluteX="15dp"
+        app:layout_constraintLeft_toLeftOf="@+id/state_name_tv"
+        app:layout_constraintRight_toRightOf="@+id/state_name_tv"
         android:layout_marginTop="@dimen/content_padding_10" />
     <TextView
         android:id="@+id/weixin_name_tv"
@@ -31,9 +31,8 @@
         android:text="xiaomianyang"
         style="@style/hint_txt_style"
         app:layout_constraintTop_toBottomOf="@+id/weixin_number_tv"
-        app:layout_editor_absoluteX="@dimen/content_padding_15"
-        android:layout_marginTop="@dimen/content_padding_10"
-        tools:layout_editor_absoluteX="15dp" />
+        app:layout_constraintLeft_toLeftOf="@+id/weixin_number_tv"
+        android:layout_marginTop="@dimen/content_padding_10" />
 
     <TextView
         android:id="@+id/wx_is_open_tv"

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

@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:padding="@dimen/content_padding_15">
+    android:padding="@dimen/content_padding_20"
+    android:layout_margin="@dimen/content_padding_10">
 
     <TextView
         android:id="@+id/state_name_tv"
+        style="@style/txt_style_15"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="正常挂机"
-        style="@style/txt_style_15"
-        tools:layout_editor_absoluteY="0dp"
-        tools:layout_editor_absoluteX="0dp" />
+        android:text="账号处理中"
+        app:layout_constraintLeft_toLeftOf="parent" />
     <TextView
         android:id="@+id/weixin_number_tv"
         android:layout_width="wrap_content"
@@ -22,7 +21,8 @@
         android:text="微信号"
         style="@style/nomal_txt_style"
         app:layout_constraintTop_toBottomOf="@+id/state_name_tv"
-        tools:layout_editor_absoluteX="15dp"
+        app:layout_constraintLeft_toLeftOf="@+id/state_name_tv"
+        app:layout_constraintRight_toRightOf="@+id/state_name_tv"
         android:layout_marginTop="@dimen/content_padding_10" />
     <TextView
         android:id="@+id/weixin_name_tv"
@@ -31,9 +31,8 @@
         android:text="xiaomianyang"
         style="@style/hint_txt_style"
         app:layout_constraintTop_toBottomOf="@+id/weixin_number_tv"
-        app:layout_editor_absoluteX="@dimen/content_padding_15"
-        android:layout_marginTop="@dimen/content_padding_10"
-        tools:layout_editor_absoluteX="15dp" />
+        app:layout_constraintLeft_toLeftOf="@+id/weixin_number_tv"
+        android:layout_marginTop="@dimen/content_padding_10" />
     <TextView
         android:id="@+id/yuan_tv"
         android:layout_width="wrap_content"

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:padding="@dimen/content_padding_15">
+    android:padding="@dimen/content_padding_20"
+    android:layout_margin="@dimen/content_padding_10">
 
     <TextView
         android:id="@+id/state_name_tv"
@@ -13,8 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="账号处理中"
-        tools:layout_editor_absoluteX="0dp"
-        tools:layout_editor_absoluteY="0dp" />
+        app:layout_constraintLeft_toLeftOf="parent" />
     <TextView
         android:id="@+id/weixin_number_tv"
         android:layout_width="wrap_content"
@@ -22,7 +21,8 @@
         android:text="微信号"
         style="@style/nomal_txt_style"
         app:layout_constraintTop_toBottomOf="@+id/state_name_tv"
-        tools:layout_editor_absoluteX="15dp"
+        app:layout_constraintLeft_toLeftOf="@+id/state_name_tv"
+        app:layout_constraintRight_toRightOf="@+id/state_name_tv"
         android:layout_marginTop="@dimen/content_padding_10" />
     <TextView
         android:id="@+id/weixin_name_tv"
@@ -31,9 +31,8 @@
         android:text="xiaomianyang"
         style="@style/hint_txt_style"
         app:layout_constraintTop_toBottomOf="@+id/weixin_number_tv"
-        app:layout_editor_absoluteX="@dimen/content_padding_15"
-        android:layout_marginTop="@dimen/content_padding_10"
-        tools:layout_editor_absoluteX="15dp" />
+        app:layout_constraintLeft_toLeftOf="@+id/weixin_number_tv"
+        android:layout_marginTop="@dimen/content_padding_10" />
 
     <TextView
         android:id="@+id/customer_service_name_tv"

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

@@ -3,8 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:padding="20dp"
-    android:layout_margin="10dp"
+    android:padding="@dimen/content_padding_20"
+    android:layout_margin="@dimen/content_padding_10"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:orientation="vertical">
     <include layout="@layout/lie_make_money_operation_item"/>

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

@@ -130,7 +130,7 @@
                 android:layout_height="wrap_content"
                 style="@style/txt_big_btn_style"
                 android:text="确 定"
-                android:background="@drawable/sp_bg_gradient_rectqangle_yellow"/>
+                android:background="@drawable/sp_bg_gradient_rectangle_yellow"/>
         </LinearLayout>
     </ScrollView>
 

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

@@ -27,5 +27,5 @@
         style="@style/txt_big_btn_style"
         android:text="立即绑定"
         android:gravity="center"
-        android:background="@drawable/sp_bg_gradient_rectqangle_yellow"/>
+        android:background="@drawable/sp_bg_gradient_rectangle_yellow"/>
 </LinearLayout>

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

@@ -95,6 +95,7 @@
         <dimen name="radius_25">25dp</dimen>
         <dimen name="radius_15">15dp</dimen>
         <dimen name="radius_10">10dp</dimen>
+        <dimen name="radius_20">20dp</dimen>
         <dimen name="radius_5">5dp</dimen>
 
     <dimen name="view_size_20">20dp</dimen>

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

@@ -25,6 +25,8 @@
     <color name="txt_black_010101">#010101</color>
     <color name="txt_red_ff4a5f">#ff4a5f</color>
 
+    <color name="yellow2_start">#FCD586</color>
+    <color name="yellow2_end">#FDB812</color>
     <color name="yellow_start">#f4c76c</color>
     <color name="yellow_end">#fd9c11</color>
     <color name="blue_start">#80d2fe</color>

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

@@ -76,7 +76,7 @@
         <item name="android:textColor">@color/txt_black</item>
         <item name="android:gravity">center</item>
         <item name="android:layout_margin">@dimen/content_padding</item>
-        <item name="android:background">@drawable/sp_bg_gradient_rectqangle_yellow</item>
+        <item name="android:background">@drawable/sp_bg_gradient_rectangle_yellow</item>
     </style>
     <style name="MyDialogActivityTheme" parent="@android:style/Theme.Dialog">
         <item name="android:windowFrame">@android:color/transparent</item><!--边框-->