Merge branch 'xatom' of https://gitee.com/fanghoo/fuzhu into xatom

app/src/main/java/com/fisherbone/fuzhu/activity/ControlWindow.java

@@ -87,7 +87,8 @@ public class ControlWindow {
                     AblUtil.openAccessibilitySettings();
                 }
                 break;
-            case "3"://执行幢号任务
+            case "3":
+                //执行幢号任务
                 if (ChangLiang.if_quguan.equals("0")) {
                     stutas(ChangLiang.isrun);
                     ChangLiang.zishuodong = "T";
@@ -98,7 +99,8 @@ public class ControlWindow {
                     AblStepHandler.sendMsg(AblSteps.STEP_70);
                 }
                 break;
-            case "4"://帐号登录任务
+            case "4":
+                //帐号登录任务
                 stutas(ChangLiang.isrun);
                 AblStepHandler.sendMsg(AblSteps.STEP_90);
                 break;
@@ -124,19 +126,18 @@ public class ControlWindow {
                 stutas(ChangLiang.isrun);
                 AblStepHandler.sendMsg(AblSteps.STEP_130);
                 break;
-            case "7"://
-                stutas(ChangLiang.isrun);
-                AblStepHandler.sendMsg(AblSteps.STEP_231);
-                break;
-            case "71"://潜在客户加关(大咖)
+            case "7":
+                //潜在客户加关(大咖)
                 stutas(ChangLiang.isrun);
                 AblStepHandler.sendMsg(AblSteps.STEP_170);
                 break;
-            case "8"://潜在客户加关(关键词)
+            case "8":
+                //潜在客户加关(关键词)
                 stutas(ChangLiang.isrun);
                 AblStepHandler.sendMsg(AblSteps.STEP_160);
                 break;
-            case "9"://粉丝通知
+            case "9":
+                //粉丝通知
                 stutas(ChangLiang.isrun);
                 String lettertype = ProfileSpUtils.getInstance().getFensiNotice().getLettertype();
                 Log.e("类型", lettertype);

app/src/main/java/com/fisherbone/fuzhu/activity/ShouQuanActivity.java

@@ -72,6 +72,7 @@ public class ShouQuanActivity extends BaseActivity {
                 paramsPost.put("network_type", "");//网络类型
                 paramsPost.put("app_version", "");//app版本
                 paramsPost.put("douyin_version", "");//抖音版本
+
                 paramsPost.put("system_version", "");//系统版本
                 paramsPost.put("device_qrcode", code);//授权码
                 paramsPost.put("phone_type", SystemUtil.getSystemModel());//手机型号
@@ -88,7 +89,7 @@ public class ShouQuanActivity extends BaseActivity {
                             //    EventBus.getDefault().post(new FirstEvent("success"));
                                 LiveEventBus.get("success").post("str");
                                 finish();
-                            }else {
+                            } else {
                                 ToastUtils.showToast(ShouQuanActivity.this, msg);
                                 SPUtils.setSP(ShouQuanActivity.this, FZConfig.IS_ACTIVATION, "0");
                             }

app/src/main/java/com/fisherbone/fuzhu/quzan/AblStep1.java

@@ -3,6 +3,7 @@ package com.fisherbone.fuzhu.quzan;
 import android.os.Message;
 import android.view.accessibility.AccessibilityNodeInfo;
 
+import com.fisherbone.fuzhu.ChangLiang;
 import com.fisherbone.fuzhu.abllib.AblService;
 import com.fisherbone.fuzhu.abllib.AblStepHandler;
 import com.fisherbone.fuzhu.abllib.AblSteps;
@@ -12,6 +13,10 @@ import com.fisherbone.fuzhu.abllib.utils.AblViewUtil;
 import java.util.Collections;
 import java.util.List;
 
+/**
+ * @author Administrator
+ * dyx 2021-10-22
+ */
 public class AblStep1 extends BaseAblStep {
     int i = 0;
     int j = 0;
@@ -25,6 +30,8 @@ public class AblStep1 extends BaseAblStep {
                 AblStepHandler.sendMsg(AblSteps.STEP_261);
                 break;
             case AblSteps.STEP_261:
+                ChangLiang.ishuodong = "T";
+                AblViewUtil.mySleep(2);
                 AblService instance = AblService.getInstance();
                 AblViewUtil.mySleep(2);
                 myClick();
@@ -45,7 +52,6 @@ public class AblStep1 extends BaseAblStep {
                 AblStepHandler.sendMsg(AblSteps.STEP_264);
                 break;
             case AblSteps.STEP_265:
-
                 AblStepHandler.sendMsg(AblSteps.STEP_264);
                 break;
             default:
@@ -53,7 +59,11 @@ public class AblStep1 extends BaseAblStep {
 
     }
 
-
+    /**
+     *
+     * @param text
+     * 根据文本寻找控件节点
+     */
     public void findAndPerformActionTextView(String text) {
         if (AblService.getInstance().getRootInActiveWindow() == null) {
             return;
@@ -84,6 +94,10 @@ public class AblStep1 extends BaseAblStep {
             }
         }
     }
+
+    /**
+     * 根据控件描述文本找到“喜欢”按钮
+     */
     public void findAndPerformActionLike() {
         if (AblService.getInstance().getRootInActiveWindow() == null) {
             return;