atom

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":177,"versionName":"1.7.7","enabled":true,"outputFile":"atom-latest.apk","fullName":"release","baseName":"release"},"path":"atom-latest.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":180,"versionName":"1.8.0","enabled":true,"outputFile":"atom-latest.apk","fullName":"release","baseName":"release"},"path":"atom-latest.apk","properties":{}}]

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

@@ -815,6 +815,7 @@ public class StartTask {
             liveBean.setDouyinhao(liveNickname);
             String accountduration = Integer.parseInt(accountDuration)*60+"";
             liveBean.setZhibomin(accountduration);
+            liveBean.setLiwucishu(giftHeart);
             if(valueOne.equals(liveSpeech)){
                 liveBean.setSwitchone(true);
             }else {

app/src/main/java/com/fisherbone/fuzhu/step/HongbaoBase.java

@@ -213,6 +213,9 @@ class HongbaoBase extends BaseAblStep implements RedEnv.RedEnvFunc, RedEnv.TimeF
                                 if ("android.widget.TextView".equals(child2.getClassName())) {
                                     if (child2.getText() != null) {
                                         String s = child2.getText().toString();
+                                        if("充值".equals(s)){
+                                            doubinum = "0";
+                                        }else {
                                             doubinum = s;
                                         }
                                     }
@@ -221,10 +224,9 @@ class HongbaoBase extends BaseAblStep implements RedEnv.RedEnvFunc, RedEnv.TimeF
                         }
                     }
                 }
-            return doubinum;
             }
-        return "0";
+        }
-
+        return doubinum;
     }
 
     /**

app/src/main/java/com/fisherbone/fuzhu/step/TestAblStep30.java

@@ -233,8 +233,11 @@ public class TestAblStep30 extends NoticeBase {
                 AblViewUtil.mySleep(1);
                 clickcommonthree(hognbaonode, "");
                 Log.e("TIAOSHI###", "发礼物的循环次数"+i);
-                String liwutime = ProfileSpUtils.getInstance().getLiveBean().getLiwutime();
+//                String liwutime = ProfileSpUtils.getInstance().getLiveBean().getLiwutime();
-                int jiangetime = Integer.valueOf(liwutime);
+//                int jiangetime = Integer.valueOf(liwutime);
+
+                Random random = new Random();
+                int jiangetime = random.nextInt(3) + 1;
                 AblViewUtil.mySleep(jiangetime);
             }
         } else {
@@ -732,6 +735,9 @@ public class TestAblStep30 extends NoticeBase {
                                 if ("android.widget.TextView".equals(child2.getClassName())) {
                                     if (child2.getText() != null) {
                                         String s = child2.getText().toString();
+                                        if("充值".equals(s)){
+                                            doubinum = 0;
+                                        }else {
                                             doubinum = Integer.valueOf(s);
                                         }
                                     }
@@ -741,6 +747,7 @@ public class TestAblStep30 extends NoticeBase {
                     }
                 }
             }
+        }
         return doubinum;
     }
 

app_config.gradle

@@ -12,8 +12,8 @@ ext {
             applicationId            : "com.fisherbone.fuzhu",
             minSdkVersion            : 24,
             targetSdkVersion         : 29,
-            versionCode              : 177,
+            versionCode              : 180,
-            versionName              : "1.7.7",
+            versionName              : "1.8.0",
             testInstrumentationRunner: "androidx.test.runner.AndroidJUnitRunner"
     ]