From a9f0b5bc3047eab56c1c1aaa686f99c576bb1025 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Wed, 12 Jul 2017 12:29:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DQQ=E7=82=B9=E8=B5=9E=E9=87=91?=
 =?UTF-8?q?=E8=B1=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/assets/sample/QQ与微信/QQ名片点赞脚本.js  | 14 +++++++++++---
 .../assets/sample/其他应用/网易云音乐批量点赞.js   |  4 ++--
 autojs/src/main/assets/modules/__general__.js      |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/assets/sample/QQ与微信/QQ名片点赞脚本.js b/app/src/main/assets/sample/QQ与微信/QQ名片点赞脚本.js
index 0099f2bc..e5c8538b 100644
--- a/app/src/main/assets/sample/QQ与微信/QQ名片点赞脚本.js
+++ b/app/src/main/assets/sample/QQ与微信/QQ名片点赞脚本.js
@@ -5,7 +5,12 @@ function 下滑(){
 }
 
 function 赞(){
-  className("ImageView").desc("赞").click();
+  var like = className("ImageView").desc("赞").find();
+  if(like){
+    like.click();
+    return true;
+  }
+  return false;
 }
 
 function 显示更多(){
@@ -16,10 +21,13 @@ function 显示更多(){
 
 toast("请打开自己的资料页，点击点赞图标");
 sleep(100);
+waitForActivity("com.tencent.mobileqq.activity.VisitorsActivity");
 
 while(notStopped()){
-  for(let i = 0; i < 10; i++){
-    赞();
+ var  i = 0;
+  while(i < 10){
+    i += 赞() ? 1 : 0;
+    click("取消");
   }
   显示更多();
   下滑();
diff --git a/app/src/main/assets/sample/其他应用/网易云音乐批量点赞.js b/app/src/main/assets/sample/其他应用/网易云音乐批量点赞.js
index 2b6209d3..990fd415 100644
--- a/app/src/main/assets/sample/其他应用/网易云音乐批量点赞.js
+++ b/app/src/main/assets/sample/其他应用/网易云音乐批量点赞.js
@@ -3,8 +3,8 @@
 launchApp("网易云音乐");
 toast("打开一个歌曲的评论页面");
 
-//循环直至当前为评论页面
-waitActivity("com.netease.cloudmusic.activity.ResourceCommentActivity");
+//等待当前为评论页面
+waitForActivity("com.netease.cloudmusic.activity.ResourceCommentActivity");
 
 
 while(true){
diff --git a/autojs/src/main/assets/modules/__general__.js b/autojs/src/main/assets/modules/__general__.js
index f06e0ba1..8b652d48 100644
--- a/autojs/src/main/assets/modules/__general__.js
+++ b/autojs/src/main/assets/modules/__general__.js
@@ -41,7 +41,7 @@ module.exports = function(__runtime__, scope){
         return __runtime__.info.getLatestActivity();
     }
 
-    scope.waitActivity = function(activity, delay){
+    scope.waitForActivity = function(activity, delay){
         delay = delay || 200;
         while(scope.currentActivity() != activity){
             sleep(delay);