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

2021-11-04 09:52:59 +08:00
parent f422ec3596 13992d482b
commit 514a88d777
5 changed files with 36 additions and 20 deletions
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -5,14 +5,14 @@
      <profile name="Gradle Imported" enabled="true">
        <outputRelativeToContentRoot value="true" />
        <processorPath useClasspath="false">
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service/1.0-rc4/44954d465f3b9065388bbd2fc08a3eb8fd07917c/auto-service-1.0-rc4.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto/auto-common/0.8/c6f7af0e57b9d69d81b05434ef9f3c5610d498c4/auto-common-0.8.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/23.5-jre/e9ce4989adf6092a3dab6152860e93d989e8cf88/guava-23.5-jre.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/2.0.0/518929596ee3249127502a8573b2e008e2d51ed3/checker-qual-2.0.0.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.0.18/5f65affce1684999e2f4024983835efc3504012e/error_prone_annotations-2.0.18.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <entry name="$PROJECT_DIR$/../../Git/bin/caches/modules-2/files-2.1/com.google.auto.service/auto-service/1.0-rc4/44954d465f3b9065388bbd2fc08a3eb8fd07917c/auto-service-1.0-rc4.jar" />
+          <entry name="$PROJECT_DIR$/../../Git/bin/caches/modules-2/files-2.1/com.google.auto/auto-common/0.8/c6f7af0e57b9d69d81b05434ef9f3c5610d498c4/auto-common-0.8.jar" />
+          <entry name="$PROJECT_DIR$/../../Git/bin/caches/modules-2/files-2.1/com.google.guava/guava/23.5-jre/e9ce4989adf6092a3dab6152860e93d989e8cf88/guava-23.5-jre.jar" />
+          <entry name="$PROJECT_DIR$/../../Git/bin/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar" />
+          <entry name="$PROJECT_DIR$/../../Git/bin/caches/modules-2/files-2.1/org.checkerframework/checker-qual/2.0.0/518929596ee3249127502a8573b2e008e2d51ed3/checker-qual-2.0.0.jar" />
+          <entry name="$PROJECT_DIR$/../../Git/bin/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.0.18/5f65affce1684999e2f4024983835efc3504012e/error_prone_annotations-2.0.18.jar" />
+          <entry name="$PROJECT_DIR$/../../Git/bin/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar" />
+          <entry name="$PROJECT_DIR$/../../Git/bin/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
        </processorPath>
        <module name="fuzhu.arouter_compiler" />
      </profile>
--- a/app/src/main/java/com/fisherbone/fuzhu/activity/ControlWindow.java
+++ b/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);
--- a/app/src/main/java/com/fisherbone/fuzhu/activity/ShouQuanActivity.java
+++ b/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");
                            }
--- a/app/src/main/java/com/fisherbone/fuzhu/quzan/AblStep1.java
+++ b/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;
--- a/arouter_compiler/build/libs/arouter_compiler.jar
+++ b/arouter_compiler/build/libs/arouter_compiler.jar