Skip to content

Commit

Permalink
修复领取森林任务奖励失败的bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@pansong291
pansong291 committed Aug 4, 2019
1 parent 72e6aed commit 94d2448
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 76 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 {
applicationId "pansong291.xposed.quickenergy"
minSdkVersion 14
targetSdkVersion 21
versionCode 20190803
versionName "1.0.7-alpha.5"
versionCode 20190804
versionName "1.1.0"
}
buildTypes {
release {
Expand Down
89 changes: 51 additions & 38 deletions app/src/main/java/pansong291/xposed/quickenergy/AntFarm.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package pansong291.xposed.quickenergy;

import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.List;
import java.util.ArrayList;
Expand Down Expand Up @@ -97,7 +96,7 @@ public static void start(ClassLoader loader, String args0, String args1, String
cityAdCode = jo.getString("cityAdCode");
districtAdCode = jo.getString("districtAdCode");
version = jo.getString("version");
}catch(JSONException e)
}catch(Exception e)
{
Log.i(TAG, "start err: args1= "+args1);
Log.printStackTrace(TAG, e);
Expand All @@ -121,6 +120,7 @@ public Runnable setData(String s, ClassLoader cl)
@Override
public void run()
{
Log.showToast("庄园功能开始…","");
try
{
JSONObject jo = new JSONObject(resp);
Expand All @@ -144,9 +144,11 @@ public void run()
Log.showDialogAndRecordLog("小鸡到好友家去做客了","");
break;
case NORMAL:
case PIRATE:
Log.showDialogAndRecordLog("小鸡太饿，离家出走了","");
break;
case PIRATE:
Log.showDialogAndRecordLog("小鸡外出探险了","");
break;
default:
Log.showDialogAndRecordLog("小鸡不在庄园",ownerAnimal.subAnimalType);
}
Expand Down Expand Up @@ -223,13 +225,15 @@ public void run()
}

// 通知好友赶鸡并帮好友喂鸡
notifyFriendAndFeedAnimal(loader);
if(Config.notifyFriend() || Config.feedFriendAnimal())
notifyFriendAndFeedAnimal(loader);

}catch(Exception e)
{
Log.i(TAG, "run err:");
Log.printStackTrace(TAG, e);
}
Log.showToast("庄园功能结束","");
}
}.setData(response, loader)).start();
}
Expand Down Expand Up @@ -285,7 +289,7 @@ private static void rewardFriend(ClassLoader loader)
Log.showDialogAndRecordLog("打赏了〔"+Config.getNameById(rewardList[i].friendId)+"〕〔"+rewardCount+"颗〕爱心鸡蛋","");
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}
rewardList = null;
Expand Down Expand Up @@ -313,7 +317,7 @@ private static void recallAnimal(ClassLoader loader, String animalId, String cur
// add2FoodStock((int)foodHaveStolen);
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}catch(Exception e)
{
Expand Down Expand Up @@ -350,19 +354,20 @@ private static void sendBackAnimal(ClassLoader loader)
if(jo.has("hitLossFood"))
{
s += "胖揍了〔"+user+"〕的小鸡，掉落了〔"+jo.getInt("hitLossFood")+"克〕饲料";
foodStock = jo.getInt("finalFoodStorage");
if(jo.has("finalFoodStorage"))
foodStock = jo.getInt("finalFoodStorage");
s += "\n剩余〔"+foodStock+"克〕饲料";
}else
s += "〔"+user+"〕的小鸡躲开了你的攻击";
}else
{
s = "已赶走〔"+user+"〕的小鸡";
}
Log.showDialogAndRecordLog(s,"");
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
Log.showDialogAndRecordLog(s,"");
}
}
if(!hasStealingAnimal)
Expand All @@ -389,7 +394,7 @@ private static void harvestProduce(ClassLoader loader, String farmId)
Log.showDialogAndRecordLog("收取了〔"+harvest+"颗〕爱心鸡蛋，剩余〔"+harvestBenevolenceScore+"颗〕","");
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}catch(Exception e)
{
Expand Down Expand Up @@ -435,12 +440,12 @@ private static void donation(ClassLoader loader)
Log.showDialogAndRecordLog("捐赠活动〔"+activityName+"〕成功，累计捐赠"+jo.getInt("donationTimesStat")+"次","");
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}catch(Exception e)
{
Expand Down Expand Up @@ -499,15 +504,15 @@ private static void answerQuestion(ClassLoader loader)
Log.showDialogAndRecordLog("答题"+s+"，可领取［"+jo.getInt("awardCount")+"克］饲料", "");
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}else
{
Log.showDialogAndRecordLog("未找到正确答案，放弃作答","");
}
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
break;

Expand All @@ -524,7 +529,7 @@ private static void answerQuestion(ClassLoader loader)
}
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}catch(Exception e)
{
Expand All @@ -544,13 +549,13 @@ private static void receiveFarmTaskAward(ClassLoader loader)
if(memo.equals("SUCCESS"))
{
JSONArray jaFarmTaskList = jo.getJSONArray("farmTaskList");
boolean hasAwardFood = false;
boolean hasCanReceive = false;
for(int i = 0; i < jaFarmTaskList.length(); i++)
{
jo = jaFarmTaskList.getJSONObject(i);
if(TaskStatus.FINISHED.name().equals(jo.getString("taskStatus")))
{
hasAwardFood = true;
hasCanReceive = true;
int awardCount = jo.getInt("awardCount");
if(awardCount + foodStock > foodStockLimit)
{
Expand All @@ -569,16 +574,16 @@ private static void receiveFarmTaskAward(ClassLoader loader)
if(unreceiveTaskAward > 0)unreceiveTaskAward--;
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}
}
if(!hasAwardFood)
if(!hasCanReceive)
Log.showDialogAndRecordLog("暂时没有可领取的饲料","");
Log.showDialogAndRecordLog("剩余〔"+foodStock+"克〕饲料","");
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}catch(Exception e)
{
Expand All @@ -598,14 +603,14 @@ private static void receiveToolTaskReward(ClassLoader loader)
if(memo.equals("SUCCESS"))
{
JSONArray jaList = jo.getJSONArray("list");
boolean hasRewardTool = false;
boolean hasCanReceive = false;
for(int i = 0; i < jaList.length(); i++)
{
jo = jaList.getJSONObject(i);
if(jo.has("taskStatus")
&& TaskStatus.FINISHED.name().equals(jo.getString("taskStatus")))
{
hasRewardTool = true;
hasCanReceive = true;
int awardCount = jo.getInt("awardCount");
String awardType = jo.getString("awardType");
ToolType toolType = ToolType.valueOf(awardType);
Expand All @@ -626,15 +631,15 @@ private static void receiveToolTaskReward(ClassLoader loader)
Log.showDialogAndRecordLog("已领取〔"+awardCount+"张〕〔"+toolType.nickName()+"〕，来源："+taskTitle,"");
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}
}
if(!hasRewardTool)
if(!hasCanReceive)
Log.showDialogAndRecordLog("暂时没有可领取的道具卡","");
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}catch(Exception e)
{
Expand Down Expand Up @@ -663,7 +668,7 @@ private static void feedAnimal(ClassLoader loader, String farmId)
Log.showDialogAndRecordLog("喂了小鸡［"+feedFood+"克］饲料，剩余〔"+foodStock+"克〕","");
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}
}catch(Exception e)
Expand Down Expand Up @@ -697,14 +702,14 @@ private static void useFarmTool(ClassLoader loader, String targetFarmId, ToolTyp
memo = jo.getString("memo");
if(memo.equals("SUCCESS"))
Log.showDialogAndRecordLog("使用成功，剩余〔"+(toolCount-1)+"张〕","");
else Log.showDialogAndRecordLog("失败，"+memo,s);
else Log.showDialogAndRecordLog(memo,s);
}else Log.showDialogAndRecordLog("没有"+toolType.nickName()+"可用","");
break;
}
}
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}catch(Exception e)
{
Expand All @@ -719,8 +724,9 @@ private static void notifyFriendAndFeedAnimal(ClassLoader loader)
{
if(Config.notifyFriend())
Log.showDialogAndRecordLog("开始通知好友来赶鸡…","");
if(Config.feedFriendAnimal())
Log.showDialogAndRecordLog("开始帮好友喂鸡…","");
boolean hasNext = false;
Object o;
String s;
JSONObject jo;
do
Expand Down Expand Up @@ -770,18 +776,22 @@ private static void notifyFriendAndFeedAnimal(ClassLoader loader)
}
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}
}
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}while(hasNext);
pageStartSum = 0;
if(Config.feedFriendAnimal())
Log.showDialogAndRecordLog("帮好友喂鸡结束","");
if(Config.notifyFriend())
Log.showDialogAndRecordLog("通知好友结束，饲料剩余〔"+foodStock+"克〕","");
Log.showDialogAndRecordLog("通知好友结束","");
if(Config.feedFriendAnimal() || Config.notifyFriend())
Log.showDialogAndRecordLog("饲料剩余〔"+foodStock+"克〕","");
}catch(Exception e)
{
Log.i(TAG, "notifyFriendAndFeed err:");
Expand All @@ -799,17 +809,20 @@ private static boolean notifyFriend(ClassLoader loader, JSONObject joAnimalStatu
String user = Config.getNameById(farmId2UserId(friendFarmId));
Log.showDialogAndRecordLog("有小鸡正在偷吃〔"+user+"〕的饲料","");
String s = rpcCall_notifyFriend(loader, animalId, friendFarmId);
joAnimalStatusVO = new JSONObject(s);
String memo = joAnimalStatusVO.getString("memo");
JSONObject jo = new JSONObject(s);
String memo = jo.getString("memo");
if(memo.equals("SUCCESS"))
{
double rewardCount = joAnimalStatusVO.getDouble("rewardCount");
foodStock = (int)joAnimalStatusVO.getDouble("finalFoodStock");
double rewardCount = jo.getDouble("rewardCount");
if(jo.getBoolean("refreshFoodStock"))
foodStock = (int)jo.getDouble("finalFoodStock");
else
add2FoodStock((int)rewardCount);
Log.showDialogAndRecordLog("已通知〔"+user+"〕，小鸡拿出〔"+rewardCount+"克〕饲料奖励你","");
return true;
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}
}catch(Exception e)
Expand Down Expand Up @@ -857,7 +870,7 @@ private static void feedFriendAnimal(ClassLoader loader, JSONArray jaAnimals, St
}
}else
{
Log.showDialogAndRecordLog("失败，"+memo,s);
Log.showDialogAndRecordLog(memo,s);
}
}
}catch(Exception e)
Expand Down
Loading

0 comments on commit 94d2448

Please sign in to comment.