Skip to content

Commit ea008eb

Browse files
FENG-MASTERFENG-MASTER
committed
1.1版本
更新日志:bugfix
1 parent 48772fc commit ea008eb

File tree

5 files changed

+124
-20
lines changed

5 files changed

+124
-20
lines changed

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ dependencies {
7272
api 'com.github.aakira:expandable-layout:1.6.0@aar'
7373
api 'org.aspectj:aspectjrt:1.8.13'
7474
testImplementation 'junit:junit:4.12'
75-
implementation files('D:/github/code/LifeGamer/libs/umeng-analytics-8.0.0.jar')
76-
implementation files('D:/github/code/LifeGamer/libs/umeng-common-2.0.1.jar')
75+
implementation files('E:/opensource/LifeGamer/code/LifeGamer/libs/umeng-analytics-8.0.0.jar')
76+
implementation files('E:/opensource/LifeGamer/code/LifeGamer/libs/umeng-common-2.0.1.jar')
7777
}
7878

7979

‎app/src/main/java/com/lifegamer/fengmaster/lifegamer/log/log/LogHandlers.java

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.lifegamer.fengmaster.lifegamer.model.RewardItem;
1212
import com.lifegamer.fengmaster.lifegamer.model.Skill;
1313
import com.lifegamer.fengmaster.lifegamer.model.Task;
14+
import com.lifegamer.fengmaster.lifegamer.model.TriggerInfo;
1415
import com.lifegamer.fengmaster.lifegamer.model.base.IdAble;
1516

1617
import org.aspectj.lang.JoinPoint;
@@ -281,6 +282,46 @@ public static void taskEditLogB(JoinPoint joinPoint,Log log){
281282

282283
// ------------------------------任务相关-------------------------------------
283284

285+
// ------------------------------触发器相关-------------------------------------
286+
287+
/**
288+
* 删除触发器日志
289+
* @param joinPoint
290+
* @param log
291+
*/
292+
@LogHandler(type = Log.TYPE.TRIGGER,action = Log.ACTION.DELETE,property = Log.PROPERTY.DEFAULT,order = Log.ORDER.BEFORE)
293+
public static void triggerDeleteLogB(JoinPoint joinPoint,Log log){
294+
commonFuncLogB(TriggerInfo.class, joinPoint, log, triggerInfo -> Long.toString(triggerInfo.getId()), triggerInfo1 -> JSONObject.toJSONString(triggerInfo1));
295+
}
296+
297+
298+
/**
299+
* 新增触发器日志
300+
* @param joinPoint
301+
* @param log
302+
*/
303+
@LogHandler(type = Log.TYPE.TRIGGER,action = Log.ACTION.CREATE,property = Log.PROPERTY.DEFAULT,order = Log.ORDER.AFTER)
304+
public static void triggerCreateLogA(JoinPoint joinPoint,Log log){
305+
commonFuncLogB(TriggerInfo.class, joinPoint, log, triggerInfo -> Long.toString(triggerInfo.getId()), triggerInfo1 -> JSONObject.toJSONString(triggerInfo1));
306+
}
307+
308+
309+
310+
/**
311+
* 编辑触发器日志
312+
* @param joinPoint
313+
* @param log
314+
*/
315+
@LogHandler(type = Log.TYPE.TRIGGER,action = Log.ACTION.EDIT,property = Log.PROPERTY.DEFAULT,order = Log.ORDER.BEFORE)
316+
public static void triggerEditLogB(JoinPoint joinPoint,Log log){
317+
commonFuncLogB(TriggerInfo.class, joinPoint, log, triggerInfo -> Long.toString(triggerInfo.getId()), triggerInfo1 -> JSONObject.toJSONString(triggerInfo1));
318+
}
319+
320+
321+
322+
323+
// ------------------------------触发器相关-------------------------------------
324+
284325

285326
// ------------------------------物品相关-------------------------------------
286327

‎app/src/main/java/com/lifegamer/fengmaster/lifegamer/manager/TriggerManager.java

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
import com.annimon.stream.function.Predicate;
99
import com.lifegamer.fengmaster.lifegamer.Game;
1010
import com.lifegamer.fengmaster.lifegamer.dao.DBHelper;
11+
import com.lifegamer.fengmaster.lifegamer.log.LogPoint;
1112
import com.lifegamer.fengmaster.lifegamer.manager.itf.ITriggerManager;
13+
import com.lifegamer.fengmaster.lifegamer.model.Log;
1214
import com.lifegamer.fengmaster.lifegamer.model.TriggerInfo;
1315
import com.lifegamer.fengmaster.lifegamer.trigger.Trigger;
1416

@@ -105,36 +107,48 @@ public boolean updateTrigger(Trigger trigger) {
105107
@Override
106108
public boolean updateTriggerInfo(TriggerInfo triggerInfo) {
107109
return addOrUpdate(triggerInfo);
108-
// Optional<TriggerInfo> first = Stream.of(triggerList).map(trigger -> trigger.getTriggerInfo()).filter(value -> value.equals(triggerInfo)).findFirst();
109-
// if (first.isPresent()){
110-
// //存在,则更新
111-
// return Game.update(triggerInfo);
112-
// }else {
113-
// return false;
114-
// }
115110

116111
}
117112

118113
private boolean addOrUpdate(TriggerInfo triggerInfo){
119114
//已经存在相同ID的触发器,认为是同一个触发器
120115
Trigger trigger = getTrigger(triggerInfo.getId());
121116
if (trigger!=null){
122-
return Game.update(trigger.getTriggerInfo());
117+
return _updteTrigger(trigger.getTriggerInfo());
123118
}else {
124-
Trigger newTrigger = newTrigger(triggerInfo);
125-
126-
long l = Game.insert(triggerInfo);
127-
if (l!=0){
128-
triggerInfo.setId(l);
129-
return true;
130-
}else {
131-
return false;
132-
}
119+
return _addTrigger(triggerInfo);
133120
}
121+
}
134122

123+
/**
124+
* 写新增触发器日志
125+
* @param triggerInfo
126+
*/
127+
@LogPoint(type = Log.TYPE.TRIGGER,action = Log.ACTION.CREATE,property = Log.PROPERTY.DEFAULT)
128+
private boolean _addTrigger(TriggerInfo triggerInfo){
129+
Trigger newTrigger = newTrigger(triggerInfo);
130+
131+
long l = Game.insert(triggerInfo);
132+
if (l!=0){
133+
triggerInfo.setId(l);
134+
return true;
135+
}else {
136+
return false;
137+
}
138+
}
135139

140+
/**
141+
* 写更新触发器日志
142+
* @param triggerInfo
143+
*/
144+
@LogPoint(type = Log.TYPE.TRIGGER,action = Log.ACTION.EDIT,property = Log.PROPERTY.DEFAULT)
145+
private boolean _updteTrigger(TriggerInfo triggerInfo){
146+
return Game.update(triggerInfo);
136147
}
137148

149+
150+
151+
138152
@Override
139153
public boolean removeTrigger(Trigger trigger) {
140154
if (trigger==null){
@@ -148,7 +162,7 @@ public boolean removeTrigger(Trigger trigger) {
148162
triggerList.remove(trigger);
149163
return true;
150164
}else {
151-
boolean delete = Game.delete(trigger.getTriggerInfo());
165+
boolean delete = _removeDBTrigger(trigger.getTriggerInfo());
152166
if (delete){
153167
triggerList.remove(trigger);
154168
return true;
@@ -165,6 +179,11 @@ public boolean removeTrigger(Trigger trigger) {
165179

166180
}
167181

182+
@LogPoint(type = Log.TYPE.TRIGGER,action = Log.ACTION.DELETE,property = Log.PROPERTY.DEFAULT)
183+
public boolean _removeDBTrigger(TriggerInfo triggerInfo){
184+
return Game.delete(triggerInfo);
185+
}
186+
168187
@Override
169188
public boolean removeTrigger(long triggerId) {
170189
Trigger trigger = getTrigger(triggerId);

‎app/src/main/java/com/lifegamer/fengmaster/lifegamer/model/Log.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ public static class TYPE {
318318
public static final String ACHIEVEMENT = "成就";
319319
public static final String ITEM = "物品";
320320
public static final String REWARDITEM = "奖励";
321+
public static final String TRIGGER = "触发器";
321322

322323
}
323324

‎app/src/main/java/com/lifegamer/fengmaster/lifegamer/model/TriggerInfo.java

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.databinding.BaseObservable;
77
import android.databinding.Bindable;
88

9+
import com.alibaba.fastjson.annotation.JSONField;
910
import com.lifegamer.fengmaster.lifegamer.BR;
1011

1112
import com.lifegamer.fengmaster.lifegamer.base.ICopy;
@@ -296,6 +297,7 @@ public void setXp(int xp) {
296297
this.xp = xp;
297298
notifyPropertyChanged(BR.xp);
298299
}
300+
@JSONField(serialize = false)
299301
@Bindable
300302
public Map<Long, Integer> getSkills() {
301303
return skills;
@@ -305,6 +307,20 @@ public void setSkills(Map<Long, Integer> skills) {
305307
this.skills = skills;
306308
notifyPropertyChanged(BR.skills);
307309
}
310+
311+
@JSONField(name = "skills")
312+
public String getSkillsStr(){
313+
return FormatUtil.skillMap2Str(getSkills());
314+
}
315+
316+
@JSONField(name = "skills")
317+
public void setSkillsStr(String str){
318+
setSkills(FormatUtil.str2SkillMap(str));
319+
}
320+
321+
322+
323+
@JSONField(serialize = false)
308324
@Bindable
309325
public List<RandomItemReward> getItems() {
310326
return items;
@@ -314,6 +330,21 @@ public void setItems(List<RandomItemReward> items) {
314330
this.items = items;
315331
notifyPropertyChanged(BR.items);
316332
}
333+
334+
@JSONField(name = "items")
335+
public String getItemsStr(){
336+
return FormatUtil.itemRewardList2Str(getItems());
337+
}
338+
339+
@JSONField(name = "items")
340+
public void setItemsStr(String str){
341+
setItems(FormatUtil.str2ItemRewardList(str));
342+
}
343+
344+
345+
346+
347+
@JSONField(serialize = false)
317348
@Bindable
318349
public List<AchievementReward> getAchievements() {
319350
return achievements;
@@ -323,6 +354,18 @@ public void setAchievements(List<AchievementReward> achievements) {
323354
this.achievements = achievements;
324355
notifyPropertyChanged(BR.achievements);
325356
}
357+
358+
359+
@JSONField(name = "achievements")
360+
public String getAchievementsStr(){
361+
return FormatUtil.achievementRewardList2Str(getAchievements());
362+
}
363+
364+
@JSONField(name = "achievements")
365+
public void setAchievementsStr(String str){
366+
setAchievements(FormatUtil.str2achievementRewardList(str));
367+
}
368+
326369
@Bindable
327370
public int getEarnLP() {
328371
return earnLP;

0 commit comments

Comments
 (0)