1.上报接口需求由0-资源下载完成1-app下载完成2-app安装完成更改为增加3-app已存在,0改为图片下载完成,1改为视频下载完成,上报字段添加dtime

2.Shareprerence删除key未删除成功更正
3.取消上报接口 原1-app下载完成
This commit is contained in:
2025-11-22 17:12:10 +08:00
parent ecdbb788f5
commit ab21451616
5 changed files with 59 additions and 33 deletions

View File

@@ -642,9 +642,9 @@ public boolean onGenericMotionEvent(MotionEvent event) {
LogUtils.loge("onMessageEvent===>"+event.action); LogUtils.loge("onMessageEvent===>"+event.action);
if(MessageEvent.ACTION_UPADATE_DATA_SOURCE.equals(event.action)) { if(MessageEvent.ACTION_UPADATE_DATA_SOURCE.equals(event.action)) {
ADManager.getInstance().updateDownloadTaskBeanTable(); ADManager.getInstance().updateDownloadTaskBeanTable();
if(isNetworkAvailable()&&ADManager.getInstance().checkTaskQueueClear()){ if(isNetworkAvailable()){
ArrayList<UploadADBean.RecordsBean> uploadAds = ADManager.getInstance().getUploadAds(); ArrayList<UploadADBean.RecordsBean> uploadAds = ADManager.getInstance().getUploadAds();
if(uploadAds.size()>1){ if(uploadAds.size()>0){
if(downLoadAdPresenter==null){ if(downLoadAdPresenter==null){
downLoadAdPresenter = new DownLoadAdPresenter(new AppnetCallback() { downLoadAdPresenter = new DownLoadAdPresenter(new AppnetCallback() {
@Override @Override

View File

@@ -82,12 +82,13 @@ public class SharePreUtils {
for (Map<String, Object> map : dataList) { for (Map<String, Object> map : dataList) {
if (map != null) { if (map != null) {
// 使用remove方法删除指定键 // 使用remove方法删除指定键
if(!map.containsKey(keyToRemove)){ if(!map.containsValue(keyToRemove)){
current.add(map); current.add(map);
} }
} }
} }
dataList=current; dataList=current;
//LogUtils.loge("removeKeyFromAllMaps current()"+current.size());
} }
public static void resetDataList(){ public static void resetDataList(){

View File

@@ -130,6 +130,7 @@ public class ADManager implements DownLoadManeger.DownloadListener {
oldfile.delete(); oldfile.delete();
} }
}else { }else {
//todo SharePreUtils.addRelation(String.valueOf(aDInfo.getAdResourceId()),String.valueOf(0));
LogUtils.loge("广告位仅换apk不换图 fresh apk not fresh img,dont delete img but download"); LogUtils.loge("广告位仅换apk不换图 fresh apk not fresh img,dont delete img but download");
} }
} }
@@ -338,7 +339,7 @@ public class ADManager implements DownLoadManeger.DownloadListener {
}else { }else {
LogUtils.loge("app已安装"); LogUtils.loge("app已安装");
SharePreUtils.addRelation(String.valueOf(adinfo.getAdResourceId()),String.valueOf(3));
} }
}else { }else {
LogUtils.loge("没有app任务"); LogUtils.loge("没有app任务");
@@ -409,7 +410,7 @@ public class ADManager implements DownLoadManeger.DownloadListener {
EventBusUtils.postMsg(new MessageEvent(MessageEvent.ACTION_UPADATE_DATA_SOURCE)); EventBusUtils.postMsg(new MessageEvent(MessageEvent.ACTION_UPADATE_DATA_SOURCE));
} }
},1000*5); },1000*5);
EventBusUtils.postMsg(new MessageEvent(MessageEvent.ACTION_UPADATE_DATA_SOURCE));
}else{ }else{
EventBusUtils.postMsg(new MessageEvent(MessageEvent.ACTION_UPADATE_DATA_SOURCE)); EventBusUtils.postMsg(new MessageEvent(MessageEvent.ACTION_UPADATE_DATA_SOURCE));
} }
@@ -507,44 +508,58 @@ public class ADManager implements DownLoadManeger.DownloadListener {
AdsInfoBean adsInfoBean = adsInfoBeanList.get(i); AdsInfoBean adsInfoBean = adsInfoBeanList.get(i);
String appUrl=adsInfoBean.getAppUrl(); String appUrl=adsInfoBean.getAppUrl();
if(!TextUtils.isEmpty(adsInfoBean.getAppUrl())){ if(!TextUtils.isEmpty(adsInfoBean.getAppUrl())){
int lastIndex = appUrl.lastIndexOf("/"); // int lastIndex = appUrl.lastIndexOf("/");
String fileName=lastIndex==-1?appUrl:appUrl.substring(lastIndex+1); // String fileName=lastIndex==-1?appUrl:appUrl.substring(lastIndex+1);
String filePath = FileUtil.getBakPath(mContext,1)+"/"+fileName; // String filePath = FileUtil.getBakPath(mContext,1)+"/"+fileName;
String tmpFilePath = FileUtil.getBakPath(mContext, 1) + "/" + fileName + "-tmp"; // String tmpFilePath = FileUtil.getBakPath(mContext, 1) + "/" + fileName + "-tmp";
File tmpFile=new File(tmpFilePath); // File tmpFile=new File(tmpFilePath);
File file =new File(filePath); // File file =new File(filePath);
if((PakageInstallUtil.checkAppInstall(mContext,adsInfoBean.getInfo()))&& !PakageInstallUtil.checkAppUpdate(mContext,adsInfoBean.getInfo(),(int) adsInfoBean.getAppVersion())){ if((PakageInstallUtil.checkAppInstall(mContext,adsInfoBean.getInfo()))&& !PakageInstallUtil.checkAppUpdate(mContext,adsInfoBean.getInfo(),(int) adsInfoBean.getAppVersion())) {
if(!SharePreUtils.filterByKeyValue(String.valueOf(adsInfoBean.getAdResourceId()),String.valueOf(2))){ if (!SharePreUtils.filterByKeyValue(String.valueOf(adsInfoBean.getAdResourceId()), String.valueOf(2))) {
LogUtils.loge("===================="+i); SharePreUtils.addRelation(String.valueOf(adsInfoBean.getAdResourceId()), String.valueOf(2));
SharePreUtils.addRelation(String.valueOf(adsInfoBean.getAdResourceId()),String.valueOf(2));
UploadADBean.RecordsBean recordsBean = new UploadADBean.RecordsBean(); UploadADBean.RecordsBean recordsBean = new UploadADBean.RecordsBean();
recordsBean.setAdResourceId(adsInfoBean.getAdResourceId()); recordsBean.setAdResourceId(adsInfoBean.getAdResourceId());
recordsBean.setType(2); if (SharePreUtils.filterByKeyValue(String.valueOf(adsInfoBean.getAdResourceId()), String.valueOf(3))) {//考虑到3为app已安装 analysisResInfo
recordsBean.setType(3);
} else {
recordsBean.setType(2);
}
uploadAdList.add(recordsBean); uploadAdList.add(recordsBean);
} }
LogUtils.loge("==============resid"+adsInfoBean.getAdResourceId()); LogUtils.loge("==============resid" + adsInfoBean.getAdResourceId());
}else if(file.exists()||(tmpFile.exists()&&tmpFile.length()==adsInfoBean.getAppSize())){ }
if(!SharePreUtils.filterByKeyValue(String.valueOf(adsInfoBean.getAdResourceId()),String.valueOf(1))){ // }else if(file.exists()||(tmpFile.exists()&&tmpFile.length()==adsInfoBean.getAppSize())){
SharePreUtils.addRelation(String.valueOf(adsInfoBean.getAdResourceId()),String.valueOf(1)); // if(!SharePreUtils.filterByKeyValue(String.valueOf(adsInfoBean.getAdResourceId()),String.valueOf(1))){
UploadADBean.RecordsBean recordsBean = new UploadADBean.RecordsBean(); // SharePreUtils.addRelation(String.valueOf(adsInfoBean.getAdResourceId()),String.valueOf(1));
recordsBean.setAdResourceId(adsInfoBean.getAdResourceId()); // UploadADBean.RecordsBean recordsBean = new UploadADBean.RecordsBean();
recordsBean.setType(1); // recordsBean.setAdResourceId(adsInfoBean.getAdResourceId());
uploadAdList.add(recordsBean); // recordsBean.setType(1);
} // uploadAdList.add(recordsBean);
} // }
// }
} }
if(!TextUtils.isEmpty(adsInfoBean.getLocalFilePath())){ if(!TextUtils.isEmpty(adsInfoBean.getLocalFilePath())){
File file = new File(adsInfoBean.getLocalFilePath()); File file = new File(adsInfoBean.getLocalFilePath());
File tmpFile=new File(adsInfoBean.getLocalFilePath()+"-tmp"); File tmpFile=new File(adsInfoBean.getLocalFilePath()+"-tmp");
if(file.exists()||(tmpFile.exists()&&tmpFile.length()==adsInfoBean.getAdSize())){ if(file.exists()||(tmpFile.exists()&&tmpFile.length()==adsInfoBean.getAdSize())){
if(!SharePreUtils.filterByKeyValue(String.valueOf(adsInfoBean.getAdResourceId()),String.valueOf(0))){ if(ADTYPE_IMAGE.equalsIgnoreCase(adsInfoBean.getAdType())){
LogUtils.loge("===================="+i); if(!SharePreUtils.filterByKeyValue(String.valueOf(adsInfoBean.getAdResourceId()),String.valueOf(0))){
SharePreUtils.addRelation(String.valueOf(adsInfoBean.getAdResourceId()),String.valueOf(0)); SharePreUtils.addRelation(String.valueOf(adsInfoBean.getAdResourceId()),String.valueOf(0));
UploadADBean.RecordsBean recordsBean = new UploadADBean.RecordsBean(); UploadADBean.RecordsBean recordsBean = new UploadADBean.RecordsBean();
recordsBean.setAdResourceId(adsInfoBean.getAdResourceId()); recordsBean.setAdResourceId(adsInfoBean.getAdResourceId());
recordsBean.setType(0); recordsBean.setType(0);
uploadAdList.add(recordsBean); uploadAdList.add(recordsBean);
}
}else if(ADTYPE_VIDEO.equalsIgnoreCase(adsInfoBean.getAdType())){
if(!SharePreUtils.filterByKeyValue(String.valueOf(adsInfoBean.getAdResourceId()),String.valueOf(1))){
SharePreUtils.addRelation(String.valueOf(adsInfoBean.getAdResourceId()),String.valueOf(1));
UploadADBean.RecordsBean recordsBean = new UploadADBean.RecordsBean();
recordsBean.setAdResourceId(adsInfoBean.getAdResourceId());
recordsBean.setType(1);
uploadAdList.add(recordsBean);
}
} }
LogUtils.loge("==============resid"+adsInfoBean.getAdResourceId()); LogUtils.loge("==============resid"+adsInfoBean.getAdResourceId());
} }
} }

View File

@@ -12,6 +12,7 @@ public class UploadADBean {
private String mac; private String mac;
private String cpu; private String cpu;
private String dtime;
private List<RecordsBean> records; private List<RecordsBean> records;
public String getMac() { public String getMac() {
@@ -38,6 +39,14 @@ public class UploadADBean {
this.records = records; this.records = records;
} }
public String getDtime() {
return dtime;
}
public void setDtime(String dtime) {
this.dtime = dtime;
}
public static class RecordsBean { public static class RecordsBean {
/** /**
* adId : 494 * adId : 494

View File

@@ -39,6 +39,7 @@ public class DownLoadAdPresenter {
uploadADBean.setCpu(cpuId); uploadADBean.setCpu(cpuId);
uploadADBean.setMac(DeviceUtil.getEthernetMac()); uploadADBean.setMac(DeviceUtil.getEthernetMac());
uploadADBean.setRecords(recordsBeans); uploadADBean.setRecords(recordsBeans);
uploadADBean.setDtime(String.valueOf(System.currentTimeMillis()));
biz.postDownloadAd(uploadADBean, new OnBaseListener() { biz.postDownloadAd(uploadADBean, new OnBaseListener() {
@Override @Override
public void onResponse(String result) { public void onResponse(String result) {