From 399ac289f80b7a40aa4210341db6b447cacdcf14 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 八月 2022 17:42:33 +0800
Subject: [PATCH] 广告升级，隐私政策整改
---
app/src/main/java/com/tejia/lijin/app/ShoppingApi.java | 77 +++++++++++---------------------------
1 files changed, 23 insertions(+), 54 deletions(-)
diff --git a/app/src/main/java/com/tejia/lijin/app/ShoppingApi.java b/app/src/main/java/com/tejia/lijin/app/ShoppingApi.java
index ff682d4..45680a6 100644
--- a/app/src/main/java/com/tejia/lijin/app/ShoppingApi.java
+++ b/app/src/main/java/com/tejia/lijin/app/ShoppingApi.java
@@ -7,6 +7,13 @@
import com.google.gson.Gson;
import com.loopj.android.http.AsyncHttpClient;
import com.loopj.android.http.SyncHttpClient;
+import com.tejia.lijin.app.entity.goods.ShareCommonGoods;
+import com.tejia.lijin.app.entity.user.TeamScreenInfo;
+import com.tejia.lijin.app.util.DeviceInfoUtil;
+import com.tejia.lijin.app.util.ToolUtil;
+import com.tejia.lijin.app.util.clipboard.ClipboardUtil;
+import com.tejia.lijin.app.util.user.LoginAndInviteStatusUtil;
+import com.tejia.lijin.app.util.user.UserUtil;
import com.wpc.library.DeviceUuidFactory;
import com.wpc.library.util.GetManifestDataUtil;
import com.wpc.library.util.MacUtil;
@@ -15,12 +22,6 @@
import com.wpc.library.util.common.PackageUtils2;
import com.wpc.library.util.common.StringUtils;
import com.wpc.library.util.security.MD5Utils;
-import com.tejia.lijin.app.entity.goods.ShareCommonGoods;
-import com.tejia.lijin.app.entity.user.TeamScreenInfo;
-import com.tejia.lijin.app.util.ToolUtil;
-import com.tejia.lijin.app.util.clipboard.ClipboardUtil;
-import com.tejia.lijin.app.util.user.LoginAndInviteStatusUtil;
-import com.tejia.lijin.app.util.user.UserUtil;
import com.yeshi.push.entity.PushRomType;
import org.apache.http.Header;
@@ -3139,9 +3140,7 @@
* @param context
* @param goodsId
* @param goodsType
- * @param lijinId
* @param uid
- * @param from
* @param handler
*/
public static void getUserLijinCreatedInfo(Context context, String goodsId, Integer goodsType, Long uid,
@@ -3475,7 +3474,7 @@
}
public static void recieveHongBao(Context context, String id,
- BasicTextHttpResponseHandler handler) {
+ BasicTextHttpResponseHandler handler) {
LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
Long uid = UserUtil.getUid(context);
if (uid != null)
@@ -3607,36 +3606,6 @@
}
}
- private static String getDeviceId(Context context) {
- SharedPreferences deviceInfo = context.getSharedPreferences("deviceInfo", MODE_PRIVATE);
- String deviceId = deviceInfo.getString("device", "");
- if (StringUtils.isEmpty(deviceId)) {
- deviceId = new DeviceUuidFactory(context).getDeviceUuid() + "";
- if (!StringUtils.isEmpty(deviceId)) {
- SharedPreferences.Editor editor = deviceInfo.edit();
- editor.putString("device", deviceId);
- editor.commit();
- }
- }
- return deviceId;
- }
-
- private static String getUtdid(Context context) {
- SharedPreferences deviceInfo = context.getSharedPreferences("deviceInfo", MODE_PRIVATE);
- String utdid = deviceInfo.getString("utdid", "");
- if (StringUtils.isEmpty(utdid)) {
- utdid = com.ta.utdid2.device.UTDevice.getUtdid(context);
- if (!StringUtils.isEmpty(utdid)) {
- SharedPreferences.Editor editor = deviceInfo.edit();
- editor.putString("utdid", utdid);
- editor.commit();
- }
- }
- if (StringUtils.isEmpty(utdid))
- return "";
- else
- return utdid;
- }
public static LinkedHashMap<String, String> validateParams(
LinkedHashMap<String, String> params, Context context) {
@@ -3646,7 +3615,7 @@
int version = PackageUtils2.getVersionCode(context);
long time = System.currentTimeMillis();
- String deviceType = MobileUtil.getSystemModel();
+ String deviceType = DeviceInfoUtil.getSystemModel(context);
params.put("packages", API_PACKAGE_NAME);
params.put("Version", version + "");
params.put("appkey", BuXinConstant.TAO_BAO_KE_KEY);
@@ -3654,16 +3623,16 @@
params.put("apiversion", "1");
params.put("channel", GetManifestDataUtil.getAppMetaData(context, "UMENG_CHANNEL"));
- String imei = MobileUtil.getIMEI(context);
+ String imei = DeviceInfoUtil.getIMEI(context);
if (!StringUtils.isEmpty(imei))
params.put("imei", imei);
- params.put("osVersion", MobileUtil.getSystemVersion());
+ params.put("osVersion", DeviceInfoUtil.getSystemVersion(context));
params.put("network", NetUtils.getNetworkState(context));
params.put("deviceType", StringUtils.isEmpty(deviceType) ? "" : deviceType);
params.put("time", time + "");
- params.put("Device", getDeviceId(context));
- params.put("utdid", getUtdid(context));
+ params.put("Device", DeviceInfoUtil.getDeviceId(context));
+ params.put("utdid", DeviceInfoUtil.getUtdid(context));
Iterator<String> its = params.keySet().iterator();
List<String> list = new ArrayList<>();
@@ -3696,23 +3665,23 @@
// }
int version = PackageUtils2.getVersionCode(context);
long time = System.currentTimeMillis();
- String deviceType = MobileUtil.getSystemModel();
+ String deviceType = DeviceInfoUtil.getSystemModel(context);
params.put("packages", API_PACKAGE_NAME);
params.put("Version", version + "");
params.put("appkey", BuXinConstant.TAO_BAO_KE_KEY);
params.put("platform", "android");
params.put("apiversion", "1");
params.put("channel", GetManifestDataUtil.getAppMetaData(context, "UMENG_CHANNEL"));
- String imei = MobileUtil.getIMEI(context);
+ String imei = DeviceInfoUtil.getIMEI(context);
if (!StringUtils.isEmpty(imei)) {
params.put("imei", imei);
}
- params.put("osVersion", MobileUtil.getSystemVersion());
+ params.put("osVersion", DeviceInfoUtil.getSystemVersion(context));
params.put("network", NetUtils.getNetworkState(context));
params.put("deviceType", StringUtils.isEmpty(deviceType) ? "" : deviceType);
params.put("time", time + "");
- params.put("Device", getDeviceId(context));
- params.put("utdid", getUtdid(context));
+ params.put("Device", DeviceInfoUtil.getDeviceId(context));
+ params.put("utdid", DeviceInfoUtil.getUtdid(context));
Iterator<String> its = params.keySet().iterator();
@@ -3755,22 +3724,22 @@
// }
int version = PackageUtils2.getVersionCode(context);
long time = System.currentTimeMillis();
- String deviceType = MobileUtil.getSystemModel();
+ String deviceType = DeviceInfoUtil.getSystemModel(context);
params.put("packages", API_PACKAGE_NAME);
params.put("Version", version + "");
params.put("appkey", BuXinConstant.TAO_BAO_KE_KEY);
params.put("platform", "android");
params.put("apiversion", "1");
params.put("channel", GetManifestDataUtil.getAppMetaData(context, "UMENG_CHANNEL"));
- String imei = MobileUtil.getIMEI(context);
+ String imei = DeviceInfoUtil.getIMEI(context);
if (!StringUtils.isEmpty(imei))
params.put("imei", imei);
- params.put("osVersion", MobileUtil.getSystemVersion());
+ params.put("osVersion", DeviceInfoUtil.getSystemVersion(context));
params.put("network", NetUtils.getNetworkState(context));
params.put("deviceType", StringUtils.isEmpty(deviceType) ? "" : deviceType);
params.put("time", time + "");
- params.put("Device", getDeviceId(context));
- params.put("utdid", getUtdid(context));
+ params.put("Device", DeviceInfoUtil.getDeviceId(context));
+ params.put("utdid", DeviceInfoUtil.getUtdid(context));
Iterator<String> its = params.keySet().iterator();
List<String> list = new ArrayList<>();
--
Gitblit v1.8.0