上报增加 _androidid
parent
df28c22959
commit
8f7ca009a9
|
@ -20,6 +20,8 @@ public class ReportBaseBean {
|
|||
|
||||
private String network_s;
|
||||
|
||||
private String _androidid;
|
||||
|
||||
public String getAccount_id() {
|
||||
return account_id;
|
||||
}
|
||||
|
@ -76,7 +78,11 @@ public class ReportBaseBean {
|
|||
this.network_s = network_s;
|
||||
}
|
||||
|
||||
public ReportBaseBean(String account_id, String distinct_id, String device_id, String ip, int country_code, String idfa_sOr_imei_s, String network_s) {
|
||||
public String get_androidid() {
|
||||
return _androidid;
|
||||
}
|
||||
|
||||
public ReportBaseBean(String account_id, String distinct_id, String device_id, String ip, int country_code, String idfa_sOr_imei_s, String network_s, String operator_s) {
|
||||
this.account_id = account_id.isEmpty()?"DEFAULT-ACCOUNT":account_id;
|
||||
this.distinct_id = distinct_id.isEmpty()?"DEFAULT-DISTINCT":distinct_id;
|
||||
this.device_id = device_id.isEmpty()?"DEFAULT-DEVICE_ID":device_id;
|
||||
|
@ -84,6 +90,7 @@ public class ReportBaseBean {
|
|||
this.country_code = country_code;
|
||||
this.idfa_sOr_imei_s = idfa_sOr_imei_s.isEmpty() ? "DEFAULT_deviceid" : idfa_sOr_imei_s;
|
||||
this.network_s = network_s.isEmpty() ? "DEFAULT_mac" : network_s;
|
||||
this._androidid = operator_s.isEmpty() ? "DEFAULT_androidid" : operator_s;
|
||||
}
|
||||
|
||||
public ReportBaseBean() {
|
||||
|
|
|
@ -153,8 +153,8 @@ public class ReportUtil {
|
|||
}
|
||||
|
||||
public static void saveBaseInfo(int uid,PlayerInfoProto.LoginRequest loginRequest){
|
||||
ReportBaseBean reportBaseBean = new ReportBaseBean(String.valueOf(uid),loginRequest.getDistinctId(),
|
||||
loginRequest.getDeviceIdS(),loginRequest.getIpS(),0, loginRequest.getIdfaSOrImeiS(), loginRequest.getNetworkS());
|
||||
ReportBaseBean reportBaseBean = new ReportBaseBean(String.valueOf(uid),loginRequest.getDistinctId(), loginRequest.getDeviceIdS(),loginRequest.getIpS(),
|
||||
0, loginRequest.getIdfaSOrImeiS(), loginRequest.getNetworkS(), loginRequest.getOperatorS());
|
||||
LOGGER.info("保存{}用户信息:{}",uid,reportBaseBean.toString());
|
||||
baseBeanMap.put(uid,reportBaseBean);
|
||||
}
|
||||
|
|
|
@ -70,7 +70,7 @@ public class UserManager {
|
|||
if (now - addTime >= LIVE_TIME) {
|
||||
userMap.remove(integerUserEntry.getId());
|
||||
userMapPutTime.remove(integerUserEntry.getId());
|
||||
ReportUtil.baseBeanMap.remove(integerUserEntry.getId());
|
||||
// ReportUtil.baseBeanMap.remove(integerUserEntry.getId());
|
||||
}
|
||||
}
|
||||
LOGGER.info("checkOffline left count={}", userMap.keySet().size());
|
||||
|
|
|
@ -281,7 +281,7 @@ public class BuyGoodsNewLogic {
|
|||
jsonObject2.put("_tz", "+8");
|
||||
jsonObject2.put("_ryos", "Android");
|
||||
jsonObject2.put("_imei", "");
|
||||
jsonObject2.put("_androidid", reportBaseBean != null ? reportBaseBean.getIdfa_sOr_imei_s() : "");
|
||||
jsonObject2.put("_androidid", reportBaseBean != null ? reportBaseBean.get_androidid() : "DEFAULT_androidid");
|
||||
jsonObject2.put("_oaid", "");
|
||||
jsonObject2.put("_mac", reportBaseBean != null ? reportBaseBean.getNetwork_s() : "");
|
||||
jsonObject.put("context", jsonObject2);
|
||||
|
|
Loading…
Reference in New Issue