From f5abfec804f928a7b38330af948e4249729c2847 Mon Sep 17 00:00:00 2001
From: wming-black <3055464370@qq.com>
Date: Tue, 30 Nov 2021 11:51:25 +0800
Subject: [PATCH] atom

---
 .idea/codeStyles/Project.xml                  |  21 +++++-------------
 .idea/codeStyles/codeStyleConfig.xml          |   5 +++++
 .idea/gradle.xml                              |   3 +--
 .idea/inspectionProfiles/Project_Default.xml  |   6 +++++
 .idea/misc.xml                                |   4 +++-
 .../fisherbone/fuzhu/abllib/AblService.java   |   8 ++++---
 .../fuzhu/abllib/utils/AblViewUtil.java       |  20 +++++++++++++----
 .../fuzhu/activity/DakaActivity.java          |   1 -
 .../com/fisherbone/fuzhu/quzan/AblStep1.java  |   2 +-
 .../fisherbone/fuzhu/step/TestAblStep6.java   |   5 +++--
 .../7986e55c0ba5fa129b1fda1b94a90ca2.bin      |   1 +
 .../build/libs/arouter_compiler.jar           | Bin 16243 -> 16243 bytes
 12 files changed, 46 insertions(+), 30 deletions(-)
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 arouter_compiler/build/.transforms/7986e55c0ba5fa129b1fda1b94a90ca2.bin

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0d15693..7643783 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,24 +1,10 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
@@ -130,5 +116,8 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index dbf0c76..22956b0 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="disableWrapperSourceDistributionNotification" value="true" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -24,7 +24,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 6560a98..257c801 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,12 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="AlibabaAbstractMethodOrInterfaceMethodMustUseJavadoc" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidCommentBehindStatement" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaCommentsMustBeJavadocFormat" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaMethodTooLong" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaRemoveCommentedCode" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaUndefineMagicConstant" enabled="false" level="MAJOR" enabled_by_default="false" />
     <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="TOP_LEVEL_CLASS_OPTIONS">
         <value>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a63bc08..19b12a8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,8 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/fuzhu/app/src/main/res/layout/activity_cancle_follow.xml" value="0.35885416666666664" />
+        <entry key="..\:/fuzhu/app/src/main/res/layout/activity_keyword.xml" value="0.35885416666666664" />
         <entry key="..\:/picture/fuzhu/app/src/main/res/layout/activity_cancel_thumb_up.xml" value="0.3170289855072464" />
         <entry key="..\:/picture/fuzhu/app/src/main/res/layout/activity_cancle_follow.xml" value="0.3541666666666667" />
         <entry key="..\:/picture/fuzhu/app/src/main/res/layout/activity_hong_bao.xml" value="0.17451874366767983" />
@@ -11,7 +13,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/fisherbone/fuzhu/abllib/AblService.java b/app/src/main/java/com/fisherbone/fuzhu/abllib/AblService.java
index f80bb66..e934a63 100644
--- a/app/src/main/java/com/fisherbone/fuzhu/abllib/AblService.java
+++ b/app/src/main/java/com/fisherbone/fuzhu/abllib/AblService.java
@@ -202,7 +202,7 @@ public class AblService extends AccessibilityService {
                     } else if (str.contains("设置抖音号")) {
                         LiveEventBus.get("runningstate").post("0");
                     }
-
+                    AblViewUtil.Close();
                     break;
                 }
             default:
@@ -212,11 +212,13 @@ public class AblService extends AccessibilityService {
 
     public void scroll2PositionClick(AccessibilityService service, String text) {
         try {
-            Thread.sleep(5000); //隔200 ms 滚动一次
+            Thread.sleep(5000);
+            //隔200 ms 滚动一次
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { //必须android4.3以上的版本
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            //必须android4.3以上的版本
             getdouyindsf();
         }
     }
diff --git a/app/src/main/java/com/fisherbone/fuzhu/abllib/utils/AblViewUtil.java b/app/src/main/java/com/fisherbone/fuzhu/abllib/utils/AblViewUtil.java
index 7fe95e3..c9cc3bd 100644
--- a/app/src/main/java/com/fisherbone/fuzhu/abllib/utils/AblViewUtil.java
+++ b/app/src/main/java/com/fisherbone/fuzhu/abllib/utils/AblViewUtil.java
@@ -99,11 +99,15 @@ public class AblViewUtil {
                     parent.findAccessibilityNodeInfosByViewId(id);
             if (accessibilityNodeInfos != null &&
                     !accessibilityNodeInfos.isEmpty()) {
-                if (anisCallBack != null) anisCallBack.succ(accessibilityNodeInfos);
+                if (anisCallBack != null) {
+                    anisCallBack.succ(accessibilityNodeInfos);
+                }
                 return accessibilityNodeInfos;
             }
         }
-        if (anisCallBack != null) anisCallBack.fail();
+        if (anisCallBack != null) {
+            anisCallBack.fail();
+        }
         return new ArrayList<>();
     }
 
@@ -190,12 +194,16 @@ public class AblViewUtil {
         AblService.getInstance().dispatchGesture(gestureDescription, new AccessibilityService.GestureResultCallback() {
             @Override
             public void onCompleted(GestureDescription gestureDescription) {
-                if (callback != null) callback.succ(gestureDescription);
+                if (callback != null) {
+                    callback.succ(gestureDescription);
+                }
             }
 
             @Override
             public void onCancelled(GestureDescription gestureDescription) {
-                if (callback != null) callback.fail(gestureDescription);
+                if (callback != null) {
+                    callback.fail(gestureDescription);
+                }
             }
         }, null);
     }
@@ -614,6 +622,10 @@ public class AblViewUtil {
         if (isContainText("检测到更新")){
             findAndPerformActionTextView("以后再说");
         }
+        if (isContainText("发现通讯录朋友")){
+            findAndPerformActionTextView("暂时不要");
+        }
+        Log.e("_____-------","弹窗解决");
     }
 
 
diff --git a/app/src/main/java/com/fisherbone/fuzhu/activity/DakaActivity.java b/app/src/main/java/com/fisherbone/fuzhu/activity/DakaActivity.java
index bddd777..4eff6cc 100644
--- a/app/src/main/java/com/fisherbone/fuzhu/activity/DakaActivity.java
+++ b/app/src/main/java/com/fisherbone/fuzhu/activity/DakaActivity.java
@@ -109,7 +109,6 @@ public class DakaActivity extends BaseActivity {
         headerAndFooterAdapter.addFooterView(footerView, 0);
         mRecyclerView.setAdapter(headerAndFooterAdapter);
     }
-
     private View getFooterView(int type, View.OnClickListener listener) {
         View view = getLayoutInflater().inflate(R.layout.footer_prilet_view, (ViewGroup) mRecyclerView.getParent(), false);
         if (type == 1) {
diff --git a/app/src/main/java/com/fisherbone/fuzhu/quzan/AblStep1.java b/app/src/main/java/com/fisherbone/fuzhu/quzan/AblStep1.java
index 4d39a20..7220960 100644
--- a/app/src/main/java/com/fisherbone/fuzhu/quzan/AblStep1.java
+++ b/app/src/main/java/com/fisherbone/fuzhu/quzan/AblStep1.java
@@ -34,7 +34,7 @@ public class AblStep1 extends BaseAblStep {
                 break;
             case AblSteps.STEP_261:
                 ChangLiang.ishuodong = "T";
-                AblViewUtil.Close();
+                //AblViewUtil.Close();
                 AblViewUtil.mySleep(5);
                 AblService instance = AblService.getInstance();
                 myClick();
diff --git a/app/src/main/java/com/fisherbone/fuzhu/step/TestAblStep6.java b/app/src/main/java/com/fisherbone/fuzhu/step/TestAblStep6.java
index 7bc0e9d..ff07903 100644
--- a/app/src/main/java/com/fisherbone/fuzhu/step/TestAblStep6.java
+++ b/app/src/main/java/com/fisherbone/fuzhu/step/TestAblStep6.java
@@ -127,7 +127,7 @@ public class TestAblStep6 extends BaseAblStep {
                     AblViewUtil.mySleep(1);
                     AccessibilityNodeInfo chilrecy = getrecy();
                     Log.e("TIAOSHI###", "向上滑动");
-                    chilrecy.performAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD); //触发容器元素的滚动事件
+                    chilrecy.performAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);//触发容器元素的滚动事件
                     AblViewUtil.mySleep(1);
                     AblStepHandler.sendMsg(AblSteps.STEP_13);
                 }
@@ -173,6 +173,7 @@ public class TestAblStep6 extends BaseAblStep {
             AccessibilityNodeInfo child = root.getChild(i);
             //  Log.e("TIAOSHI###", "----oneNode:" + child.getClassName() + ":" + child.getText() + ":" + child.getContentDescription());
             // nodeZuobiao(child);
+
             for (int y = 0; y < child.getChildCount(); y++) {
                 AccessibilityNodeInfo child1 = child.getChild(y);
                 //  Log.e("TIAOSHI###", "----twoNode:" + child1.getClassName() + ":" + child1.getText() + ":" + child1.getContentDescription());
@@ -326,7 +327,7 @@ public class TestAblStep6 extends BaseAblStep {
                         }
                         if (child.getText().toString().equals("互相关注")) {
                             AblViewUtil.mySleep(1);
-                         //   clickcommontwo(child, "互相关注");
+                         //clickcommontwo(child, "互相关注");
                             Rect rect = new Rect();
                             child.getBoundsInScreen(rect);
                             if (rect.top <= 2100) {
diff --git a/arouter_compiler/build/.transforms/7986e55c0ba5fa129b1fda1b94a90ca2.bin b/arouter_compiler/build/.transforms/7986e55c0ba5fa129b1fda1b94a90ca2.bin
new file mode 100644
index 0000000..1ed65e0
--- /dev/null
+++ b/arouter_compiler/build/.transforms/7986e55c0ba5fa129b1fda1b94a90ca2.bin
@@ -0,0 +1 @@
+i/
diff --git a/arouter_compiler/build/libs/arouter_compiler.jar b/arouter_compiler/build/libs/arouter_compiler.jar
index 7f02485c25393f479431f17d22d19824b9145fdf..6bee1f50da29756570843fc560f815013f8e44d2 100644
GIT binary patch
delta 276
zcmexd_qmQYz?+$ci-CcIgP|;_dLpkH%WAjk;ECp*%ph*FBA8mP1*Wc8^8p2e+l9HB
zK8i9hNSjXnAfqz*y|vipaK_)FASH`K#Th~L<_L){7BJ(f%nMF1<APcYFNiT&-^39t
zP;By?3CxH!k7Z&m1<LHT)Cbe=E&ISK8>~#gu9>{U$_^~>(@GyqYg=1@=`?GwGbeAd
vjtBEaY!bnAg-tq`eq;j?cd><tudww8i~q7s0n>?g$zThQ+u4F?cKaLvFMDF-

delta 276
zcmexd_qmQYz?+$ci-CcIgW*PO*+gD7mNVN*0w<b#GS4hCoY<@grj~1gsVmleK*8X4
zVXmf+q6`eurjtL&s7!uuEw(wF@wX^Q$>LCPMi9L@LZXWW%y=sEf)mWRpccamVocUI
zaRdt#n>=R%Gh)qS!Hmg!E%m`F-dpxD106HD!O8^en#nt??7$K~tsn}ttu4U(G;6Rk
yCvUQj2lGX262WwZO*)u<WCIa*v4x1Qu=NLv|FTU1(}{M;VEVY7EtqDv&jA2)`DA(k