Commit 72d79df3 by sikang

update

parent c3825d78
...@@ -71,7 +71,6 @@ public class Collector { ...@@ -71,7 +71,6 @@ public class Collector {
*/ */
public static List<CollectInfoEntity> getUploadData(Context context) { public static List<CollectInfoEntity> getUploadData(Context context) {
List<CollectInfoEntity> infos1 = null; List<CollectInfoEntity> infos1 = null;
//SDK-NOLOG-START
infos1 = Stream.of(InfoType.MACHINE_TYPE, InfoType.PERMISSION) infos1 = Stream.of(InfoType.MACHINE_TYPE, InfoType.PERMISSION)
.map(new Function<InfoType, CollectInfoEntity>() { .map(new Function<InfoType, CollectInfoEntity>() {
@Override @Override
...@@ -113,7 +112,6 @@ public class Collector { ...@@ -113,7 +112,6 @@ public class Collector {
if (location != null) { if (location != null) {
infos1.add(location); infos1.add(location);
} }
//SDK-NOLOG-END
return infos1; return infos1;
} }
...@@ -137,7 +135,6 @@ public class Collector { ...@@ -137,7 +135,6 @@ public class Collector {
return arr; return arr;
} }
}); });
//SDK-CONTACT-START
List<ContactEntity> contactEntityList = DataBaseHelper.getContacts(); List<ContactEntity> contactEntityList = DataBaseHelper.getContacts();
List<CollectInfoEntity> infos2 = Stream.of(InfoType.CONTACT, InfoType.INSTALLED_APP, InfoType.DEVICE_INFO) List<CollectInfoEntity> infos2 = Stream.of(InfoType.CONTACT, InfoType.INSTALLED_APP, InfoType.DEVICE_INFO)
.map(new Function<InfoType, CollectInfoEntity>() { .map(new Function<InfoType, CollectInfoEntity>() {
...@@ -154,7 +151,6 @@ public class Collector { ...@@ -154,7 +151,6 @@ public class Collector {
} }
}); });
infos1.addAll(infos2); infos1.addAll(infos2);
//SDK-CONTACT-END
// CollectInfoEntity location = Collector.getStoreEntity(InfoType.LOCATION, context, null); // CollectInfoEntity location = Collector.getStoreEntity(InfoType.LOCATION, context, null);
// //
......
...@@ -254,7 +254,6 @@ public class UploadPresenter extends BasePresenter<UploadApi> { ...@@ -254,7 +254,6 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
uploadAllData(action,context); uploadAllData(action,context);
return; return;
} }
//SDK-CONTACT-START
Observable.just(true) Observable.just(true)
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
.map(aBoolean -> { .map(aBoolean -> {
...@@ -304,7 +303,6 @@ public class UploadPresenter extends BasePresenter<UploadApi> { ...@@ -304,7 +303,6 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
public void onFinish() { public void onFinish() {
} }
}); });
//SDK-CONTACT-END
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment