diff --git a/app/release/atom-latest.apk b/app/release/atom-latest.apk index 0dc5a01..009da9b 100644 Binary files a/app/release/atom-latest.apk and b/app/release/atom-latest.apk differ diff --git a/app/release/output.json b/app/release/output.json index eca00e0..cdd7766 100644 --- a/app/release/output.json +++ b/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":{}}] \ No newline at end of file +[{"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":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/fisherbone/fuzhu/activity/StartTask.java b/app/src/main/java/com/fisherbone/fuzhu/activity/StartTask.java index 046ae10..c6a3b3f 100644 --- a/app/src/main/java/com/fisherbone/fuzhu/activity/StartTask.java +++ b/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 { diff --git a/app/src/main/java/com/fisherbone/fuzhu/step/HongbaoBase.java b/app/src/main/java/com/fisherbone/fuzhu/step/HongbaoBase.java index 6496c96..3f23fdb 100644 --- a/app/src/main/java/com/fisherbone/fuzhu/step/HongbaoBase.java +++ b/app/src/main/java/com/fisherbone/fuzhu/step/HongbaoBase.java @@ -213,7 +213,11 @@ 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(); - doubinum = s; + if("充值".equals(s)){ + doubinum = "0"; + }else { + doubinum = s; + } } } } @@ -221,10 +225,8 @@ class HongbaoBase extends BaseAblStep implements RedEnv.RedEnvFunc, RedEnv.TimeF } } } - return doubinum; } - return "0"; - + return doubinum; } /** diff --git a/app/src/main/java/com/fisherbone/fuzhu/step/TestAblStep30.java b/app/src/main/java/com/fisherbone/fuzhu/step/TestAblStep30.java index 396a033..47694d5 100644 --- a/app/src/main/java/com/fisherbone/fuzhu/step/TestAblStep30.java +++ b/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(); - int jiangetime = Integer.valueOf(liwutime); +// String liwutime = ProfileSpUtils.getInstance().getLiveBean().getLiwutime(); +// int jiangetime = Integer.valueOf(liwutime); + + Random random = new Random(); + int jiangetime = random.nextInt(3) + 1; AblViewUtil.mySleep(jiangetime); } } else { @@ -732,7 +735,11 @@ public class TestAblStep30 extends NoticeBase { if ("android.widget.TextView".equals(child2.getClassName())) { if (child2.getText() != null) { String s = child2.getText().toString(); - doubinum = Integer.valueOf(s); + if("充值".equals(s)){ + doubinum = 0; + }else { + doubinum = Integer.valueOf(s); + } } } } diff --git a/app_config.gradle b/app_config.gradle index 7c78d24..7493c52 100644 --- a/app_config.gradle +++ b/app_config.gradle @@ -12,8 +12,8 @@ ext { applicationId : "com.fisherbone.fuzhu", minSdkVersion : 24, targetSdkVersion : 29, - versionCode : 177, - versionName : "1.7.7", + versionCode : 180, + versionName : "1.8.0", testInstrumentationRunner: "androidx.test.runner.AndroidJUnitRunner" ]