zengjiebin лет назад: 8
Родитель
Сommit
faea81f671

+ 18 - 8
app/src/main/java/com/sheep/gamegroup/view/activity/LieMakeMoneyAct.java

@@ -112,6 +112,16 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
         }
         presenter.getWebchat();
     }
+
+    public static final int STATE_ON_HOOK_UNVERIFIED = 0;//未验证
+    public static final int STATE_ON_HOOK_NORMAL = 1;//正常(脚本验证成功)
+    public static final int STATE_ON_HOOK_NEED_VC = 2;//需要用户验证码
+    public static final int STATE_ON_HOOK_BLOCKED = 3;//被封
+    public static final int STATE_ON_HOOK_DEBLOCKED = 4;//用户已经解封等待脚本验证
+    public static final int STATE_ON_HOOK_ABNORMAL = 5;//账号异常
+    public static final int STATE_ON_HOOK_VC_OVERTIME = 6;//验证码超时请重新上传
+    public static final int STATE_ON_HOOK_VERIFIED = 7;//用户已经验证等待脚本验证
+
     //{ "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) {
@@ -120,18 +130,18 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
         boolean hasWxAccountAbnormal = false;
         for (WXOnHookAccount wxOnHookAccount : list) {
             switch (wxOnHookAccount.getStatus()) {
-                case 0://未验证
+                case STATE_ON_HOOK_UNVERIFIED://未验证
                     lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.PROCESS_ON_HOOK, wxOnHookAccount));
                     break;
-                case 1://正常(脚本验证成功)
+                case STATE_ON_HOOK_NORMAL://正常(脚本验证成功)
                     lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.NORMAL_ON_HOOK, wxOnHookAccount));
                     break;
-                case 2://需要用户验证码
-                case 3://用户已经验证等待脚本验证
-                case 4://被封
-                case 5://用户已经解封等待脚本验证
-                case 6://账号异常
-                case 7://验证码超时
+                case STATE_ON_HOOK_NEED_VC:
+                case STATE_ON_HOOK_BLOCKED:
+                case STATE_ON_HOOK_DEBLOCKED:
+                case STATE_ON_HOOK_ABNORMAL:
+                case STATE_ON_HOOK_VC_OVERTIME:
+                case STATE_ON_HOOK_VERIFIED:
                 default:
                     lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.ABNORMAL_ON_HOOK, wxOnHookAccount));
                     hasWxAccountAbnormal = true;

+ 18 - 11
app/src/main/java/com/sheep/gamegroup/view/adapter/LieMakeMoneyAdp.java

@@ -20,6 +20,13 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.List;
 
+import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_ABNORMAL;
+import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_BLOCKED;
+import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_DEBLOCKED;
+import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_NEED_VC;
+import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_VC_OVERTIME;
+import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_VERIFIED;
+
 /**
  * Created by realicing on 2018/3/23.
  * realicing@sina.com
@@ -104,19 +111,19 @@ public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
             wx_is_open_tv.setText(dataObjT.getRemarks());
         }
         switch (dataObjT.getStatus()) {
-            case 2://需要用户验证码
+            case STATE_ON_HOOK_NEED_VC://需要用户验证码
                 earnings_name_tv.setText("需要用户验证码");
                 break;
-            case 3://被封
+            case STATE_ON_HOOK_BLOCKED://被封
                 earnings_name_tv.setText("账号被封");
                 break;
-            case 4://用户已经解封等待脚本验证
+            case STATE_ON_HOOK_DEBLOCKED://用户已经解封等待脚本验证
                 earnings_name_tv.setText("等待服务器验证");
                 break;
-            case 5://账号异常
+            case STATE_ON_HOOK_ABNORMAL://账号异常
                 earnings_name_tv.setText("账号异常");
                 break;
-            case 6://验证码超时请重新上传
+            case STATE_ON_HOOK_VC_OVERTIME://验证码超时请重新上传
                 earnings_name_tv.setText("验证码超时");
                 break;
             case 7://用户已经验证等待脚本验证
@@ -129,24 +136,24 @@ public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
         //TODO 各种状态用户可以进行不同的操作
         wx_is_open_tv.setOnClickListener(view -> {
             switch (dataObjT.getStatus()) {
-                case 2://需要用户验证码
-                case 6://验证码超时请重新上传
+                case STATE_ON_HOOK_NEED_VC://需要用户验证码
+                case STATE_ON_HOOK_VC_OVERTIME://验证码超时请重新上传
                     //修改验证码
                     Jump2View.getInstance().goCommitWxCodeOnHookView(this.context, dataObjT, CommitWxCodeAct.ALTER_CODE);
                     break;
-                case 5://账号异常
+                case STATE_ON_HOOK_ABNORMAL://账号异常
                     //修改用户信息
                     Jump2View.getInstance().goCommitWxCodeOnHookView(this.context, dataObjT, CommitWxCodeAct.ALTER_INFO);
                     break;
-                case 3://被封
+                case STATE_ON_HOOK_BLOCKED://被封
                     if (context instanceof Activity){
                         DialogAccountAbnormal.showDialog((Activity) context);
                     }else if(BuildConfig.DEBUG) {
                         G.showToast("context不是activity,无法弹出对话框!");
                     }
                     break;
-                case 4://用户已经解封等待脚本验证
-                case 7://用户已经验证等待脚本验证
+                case STATE_ON_HOOK_DEBLOCKED://用户已经解封等待脚本验证
+                case STATE_ON_HOOK_VERIFIED://用户已经验证等待脚本验证
                 default:
                     G.showToast("请等待或者联系客服:"+dataObjT.getCustomer_service());
                     break;

+ 5 - 1
app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAccountAbnormal.java

@@ -47,7 +47,11 @@ public class DialogAccountAbnormal {
             return mAlertDialog;//如果不是顶层窗口,那就不显示了。
         }
 
-        mAlertDialog.show();
+        try {
+            mAlertDialog.show();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return mAlertDialog;
     }
 }

+ 1 - 1
app/src/main/res/layout/lie_make_money_abnormal_item.xml

@@ -12,7 +12,7 @@
         style="@style/txt_style_15"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="账号处理中"
+        android:text="账号异常"
         app:layout_constraintLeft_toLeftOf="parent" />
     <TextView
         android:id="@+id/weixin_number_tv"

+ 1 - 1
app/src/main/res/layout/lie_make_money_normal_item.xml

@@ -12,7 +12,7 @@
         style="@style/txt_style_15"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="账号处理中"
+        android:text="正常挂机中"
         app:layout_constraintLeft_toLeftOf="parent" />
     <TextView
         android:id="@+id/weixin_number_tv"