Skip to content

Commit

Permalink
合并来自cwj851的PR。感谢cwj851为项目做出的贡献。兑换限时双击卡，保护地，绿色打卡，修复运行功能(运动宝箱、捐步、捐运动币)，…
Browse files Browse the repository at this point in the history 
…增加首页收集运动币功能.增加神奇物种卡片功能，庄园每日签到功能
  • Loading branch information
@constanline
constanline committed Jul 31, 2023
1 parent 0ce75df commit f3865d2
Show file tree
Hide file tree
Showing 28 changed files with 1,612 additions and 452 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
minSdkVersion 23
//noinspection ExpiredTargetSdkVersion
targetSdkVersion 29
versionCode 26
versionName "1.0.9"
versionCode 27
versionName "1.0.10"
}
buildTypes {
release {
Expand Down
34 changes: 33 additions & 1 deletion app/src/main/java/pansong291/xposed/quickenergy/AntFarm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,9 @@ private static void receiveFarmTaskAward() {
String s = AntFarmRpcCall.listFarmTask();
JSONObject jo = new JSONObject(s);
String memo = jo.getString("memo");
if(memo.equals("SUCCESS")) {
if (memo.equals("SUCCESS")) {
JSONObject signList = jo.getJSONObject("signList");
sign(signList);
JSONArray jaFarmTaskList = jo.getJSONArray("farmTaskList");
for(int i = 0; i < jaFarmTaskList.length(); i++) {
jo = jaFarmTaskList.getJSONObject(i);
Expand Down Expand Up @@ -609,6 +611,36 @@ private static void receiveFarmTaskAward() {
}
}

private static boolean sign(JSONObject signList) {
try {
JSONArray jaFarmsignList = signList.getJSONArray("signList");
boolean signed = true;
int awardCount = 0;
for (int i = 0; i < jaFarmsignList.length(); i++) {
JSONObject jo = jaFarmsignList.getJSONObject(i);
if (Log.getFormatDate().equals(jo.getString("signKey"))) {
signed = jo.getBoolean("signed");
awardCount = jo.getInt("awardCount");
break;
}
}
if (!signed) {
JSONObject joSign = new JSONObject(AntFarmRpcCall.sign());
if (joSign.getString("memo").equals("SUCCESS")) {
Log.farm("庄园签到获得饲料[" + awardCount + "g]");
} else {
Log.i(TAG, joSign.toString());
}
} else {
Log.recordLog("庄园今日已签到", "");
}
} catch (Throwable t) {
Log.i(TAG, "Farmsign err:");
Log.printStackTrace(TAG, t);
}
return false;
}

private static void feedAnimal(String farmId) {
try {
if (foodStock < 180) {
Expand Down
187 changes: 176 additions & 11 deletions app/src/main/java/pansong291/xposed/quickenergy/AntForest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.json.JSONObject;
import pansong291.xposed.quickenergy.AntFarm.TaskStatus;
import pansong291.xposed.quickenergy.hook.AntForestRpcCall;
import pansong291.xposed.quickenergy.hook.EcoLifeRpcCall;
import pansong291.xposed.quickenergy.util.*;

import java.util.*;
Expand Down Expand Up @@ -117,17 +118,31 @@ public void run() {
if (Config.energyRain()) {
energyRain();
}
if (Config.ExchangeEnergyDoubleClick() && Statistics.canExchangeDoubleCardToday()) {
int exchangeCount = Config.getExchangeEnergyDoubleClickCount();
int exchangeTimes = exchangeEnergyDoubleClick(exchangeCount);
}
if (Config.ecoLifeTick()) {
ecoLifeTick();
}
if (Config.antdodoCollect()) {
antdodoCollect();
}
for (int i = 0; i < Config.getWaterFriendList().size(); i++) {
String uid = Config.getWaterFriendList().get(i);
if (selfId.equals(uid)) continue;
if (selfId.equals(uid))
continue;
int waterCount = Config.getWaterCountList().get(i);
if (waterCount <= 0) continue;
if (waterCount > 3) waterCount = 3;
if (waterCount <= 0)
continue;
if (waterCount > 3)
waterCount = 3;
if (Statistics.canWaterFriendToday(uid, waterCount)) {
waterFriendEnergy(uid, waterCount);
}
}
if (Statistics.canSyncStepToday() && TimeUtil.getTimeStr().compareTo("0800") >= 0) {
if (Statistics.canSyncStepToday(FriendIdMap.currentUid)
&& TimeUtil.getTimeStr().compareTo("0600") >= 0) {
new StepTask(loader).start();
}
}
Expand Down Expand Up @@ -606,6 +621,37 @@ private static int returnFriendWater(String userId, String userName, String bizN
return wateredTimes;
}

private static int exchangeEnergyDoubleClick(int count) {
int exchangedTimes = 0;
try {
String s;
JSONObject jo;
for (int exchangeCount = 1; exchangeCount <= count; exchangeCount++) {
if (Statistics.canExchangeDoubleCardToday()) {
s = AntForestRpcCall.exchangeBenefit("CR20230516000362", "CR20230516000363");
jo = new JSONObject(s);
if ("SUCCESS".equals(jo.getString("resultCode"))) {
exchangedTimes = Statistics.getExchangeTimes() + 1;
Log.forest("活力值兑换[限时双击卡]成功！[第" + exchangedTimes + "次]");
Statistics.exchangeDoubleCardToday(true);
} else {
Log.recordLog(jo.getString("resultDesc"), jo.toString());
Statistics.exchangeDoubleCardToday(false);
break;
}
Thread.sleep(1000);
} else {
break;
}

}
} catch (Throwable t) {
Log.i(TAG, "exchangeEnergyDoubleClick err:");
Log.printStackTrace(TAG, t);
}
return exchangedTimes;
}

private static void receiveTaskAward() {
try {
String s = AntForestRpcCall.queryTaskList();
Expand Down Expand Up @@ -770,29 +816,30 @@ private static void useDoubleCard() {
JSONArray forestPropVOList = jo.getJSONArray("forestPropVOList");
String propId = null;
String propType = null;
String propName = null;
for (int i = 0; i < forestPropVOList.length(); i++) {
JSONObject forestPropVO = forestPropVOList.getJSONObject(i);
String tmpPropType = forestPropVO.getString("propType");
if ("LIMIT_TIME_ENERGY_DOUBLE_CLICK".equals(tmpPropType)) {
JSONArray propIdList = forestPropVO.getJSONArray("propIdList");
propId = propIdList.getString(0);
propType = tmpPropType;
Log.forest("检测到【限时双击卡】" + propId);
propName = "限时双击卡";
break;
}
if ("ENERGY_DOUBLE_CLICK".equals(tmpPropType)) {
JSONArray propIdList = forestPropVO.getJSONArray("propIdList");
propId = propIdList.getString(0);
propType = tmpPropType;
Log.forest("检测到【双击卡】" + propId);
propName = "双击卡";
}
}
if (!StringUtil.isEmpty(propId)) {
Log.forest("尝试使用【双击卡】【" + propType + "】" + propId);
// Log.forest("尝试使用[双击卡][" + propType + "]" + propId);
jo = new JSONObject(AntForestRpcCall.consumeProp(propId, propType));
if ("SUCCESS".equals(jo.getString("resultCode"))) {
doubleEndTime = System.currentTimeMillis() + 1000 * 60 * 5;
Log.forest("使用【双击卡】成功");
Log.forest("使用[" + propName + "]成功");
} else {
Log.recordLog(jo.getString("resultDesc"), jo.toString());
updateDoubleTime();
Expand All @@ -805,6 +852,124 @@ private static void useDoubleCard() {
}
}

private static void ecoLifeTick() {
try {
JSONObject jo = new JSONObject(EcoLifeRpcCall.queryHomePage());
if ("SUCCESS".equals(jo.getString("resultCode"))) {
JSONObject data = jo.getJSONObject("data");
String dayPoint = data.getString("dayPoint");
JSONArray actionListVO = data.getJSONArray("actionListVO");
for (int i = 0; i < actionListVO.length(); i++) {
JSONObject actionVO = actionListVO.getJSONObject(i);
JSONArray actionItemList = actionVO.getJSONArray("actionItemList");
for (int j = 0; j < actionItemList.length(); j++) {
JSONObject actionItem = actionItemList.getJSONObject(j);
if (!actionItem.has("actionId"))
continue;
if (actionItem.getBoolean("actionStatus"))
continue;
String actionId = actionItem.getString("actionId");
String actionName = actionItem.getString("actionName");
boolean isGuangpan = false;
if ("photoguangpan".equals(actionId))continue;
jo = new JSONObject(EcoLifeRpcCall.tick(actionId, "ALIPAY", dayPoint, isGuangpan));
if ("SUCCESS".equals(jo.getString("resultCode"))) {
Log.forest("绿色打卡[" + actionName + "]成功");
} else {
Log.recordLog(jo.getString("resultDesc"), jo.toString());
}
Thread.sleep(500);
}
}
}
} catch (Throwable th) {
Log.i(TAG, "ecoLifeTick err:");
Log.printStackTrace(TAG, th);
}
}

private static void antdodoCollect() {
try {
String s = AntForestRpcCall.queryAnimalStatus();
JSONObject jo = new JSONObject(s);
if (jo.getString("resultCode").equals("SUCCESS")) {
JSONObject data = jo.getJSONObject("data");
// s = data.getString("homeState");
// if (s.equals("DODO_NOT_OPEN")) {
// collectAnimalCard();
// } else if (s.equals("DODO_NEW_BOOK")) {
// //taskEntrance();
// collectAnimalCard();
// } else if (s.equals("DODO_BOOK")) {//DODO_TAKE_LOOK
if (data.getBoolean("collect")) {
Log.recordLog("神奇物种卡片今日收集完成！", "");
} else {
collectAnimalCard();
}
// }
} else {
Log.i(TAG, jo.getString("resultDesc"));
}
} catch (Throwable t) {
Log.i(TAG, "antdodoCollect err:");
Log.printStackTrace(TAG, t);
}
}

private static void collectAnimalCard() {
try {
JSONObject jo = new JSONObject(AntForestRpcCall.antdodoHomePage());
if (jo.getString("resultCode").equals("SUCCESS")) {
JSONObject data = jo.getJSONObject("data");
JSONArray ja = data.getJSONArray("limit");
int index = -1;
for (int i = 0; i < ja.length(); i++) {
jo = ja.getJSONObject(i);
if (jo.getString("actionCode").equals("DAILY_COLLECT")) {
index = i;
break;
}
}
if (index >= 0) {
int leftFreeQuota = jo.getInt("leftFreeQuota");
for (int j = 0; j < leftFreeQuota; j++) {
jo = new JSONObject(AntForestRpcCall.antdodoCollect());
if (jo.getString("resultCode").equals("SUCCESS")) {
data = jo.getJSONObject("data");
JSONObject animal = data.getJSONObject("animal");
String ecosystem = animal.getString("ecosystem");
String name = animal.getString("name");
Log.forest("神奇物种获得[" + ecosystem + "-" + name + "]卡片");
} else {
Log.i(TAG, jo.getString("resultDesc"));
}
}
}
} else {
Log.i(TAG, jo.getString("resultDesc"));
}
} catch (Throwable t) {
Log.i(TAG, "collect err:");
Log.printStackTrace(TAG, t);
}
}

private static void taskEntrance() {
try {
String s = AntForestRpcCall.taskEntrance();
JSONObject jo = new JSONObject(s);
if (jo.getString("resultCode").equals("SUCCESS")) {
Log.recordLog("神奇物种卡片开启新图鉴！", "");
antdodoCollect();
} else {
Log.i(TAG, jo.getString("resultDesc"));
}
} catch (Throwable t) {
Log.i(TAG, "taskEntrance err:");
Log.printStackTrace(TAG, t);
}
}

/**
* Execute.
*
Expand Down Expand Up @@ -883,11 +1048,11 @@ public void run() {
loader.loadClass("com.alibaba.health.pedometer.intergation.rpc.RpcManager"),
"a"), "a", new Object[]{ step, Boolean.FALSE, "system" });
if (booleanValue) {
Log.recordLog("记录运动步数成功:" + step, "");
Log.recordLog("同步运动步数成功:" + step, "");
} else {
Log.recordLog("修改运动步数失败:" + step, "");
Log.recordLog("同步运动步数失败:" + step, "");
}
Statistics.SyncStepToday();
Statistics.SyncStepToday(FriendIdMap.currentUid);
} catch (Throwable t) {
Log.i(TAG, "StepTask.run err:");
Log.printStackTrace(TAG, t);
Expand Down
Loading

0 comments on commit f3865d2

Please sign in to comment.