Merge branch 'project0.93'

back_recharge
wangyuan 2019-09-27 14:58:45 +08:00
commit 9c33a505a6
3 changed files with 5 additions and 20 deletions

View File

@ -50,21 +50,6 @@ public class DataMessageUtils {
logQueue_37.drainTo(sendData37List, 10);
if (!sendDataList.isEmpty()) {
class ExclusionStrategy implements com.google.gson.ExclusionStrategy{
@Override
public boolean shouldSkipField(FieldAttributes fieldAttributes) {
return "device_id_s".equals(fieldAttributes.getName()) && "ParamEnvironmentBean".equals(fieldAttributes.getDeclaringClass().getSimpleName());
}
@Override
public boolean shouldSkipClass(Class<?> aClass) {
return false;
}
}
Gson gson = new GsonBuilder()
.setExclusionStrategies(new ExclusionStrategy()) // <---
.create();
KTSendBody sendBody = new KTSendBody(sendDataList);
HttpPool.sendPost(sendUrl, gson.toJson(sendBody));
}

View File

@ -4,7 +4,7 @@ public class ParamEnvironmentSimpleBean extends ParamEnvironmentBean{
private String idfa_s; // ios设备唯一标识必须添加该字段
private String imei_s;// 安卓设备唯一标识,必须添加该字段
private String device_id_s;
private String app_device_id_s;
private String brand_s;
private String dpi_s;
private String operator_s;
@ -20,7 +20,7 @@ public class ParamEnvironmentSimpleBean extends ParamEnvironmentBean{
}
public String getApp_device_id_s() {
return device_id_s;
return app_device_id_s;
}
public String getBrand_s() {
@ -52,7 +52,7 @@ public class ParamEnvironmentSimpleBean extends ParamEnvironmentBean{
}
public void setApp_device_id_s(String app_device_id_s) {
this.device_id_s = app_device_id_s;
this.app_device_id_s = app_device_id_s;
}
public void setBrand_s(String brand_s) {
@ -78,7 +78,7 @@ public class ParamEnvironmentSimpleBean extends ParamEnvironmentBean{
public ParamEnvironmentSimpleBean(String idfa_s, String imei_s, String app_device_id_s, String brand_s, String dpi_s, String operator_s, String os_version_s, boolean wifi_b) {
this.idfa_s = idfa_s;
this.imei_s = imei_s;
this.device_id_s = app_device_id_s;
this.app_device_id_s = app_device_id_s;
this.brand_s = brand_s;
this.dpi_s = dpi_s;
this.operator_s = operator_s;

View File

@ -160,7 +160,7 @@ public class ItemUtil {
if (sRewardGroupExtra == null) {
continue;
}
selectDrop(sRewardGroup, itemMap, cardMap, equipMap, randomMap, dropRatio);
selectDrop(sRewardGroupExtra, itemMap, cardMap, equipMap, randomMap, dropRatio);
}
}
}