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 | 348 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 218 insertions(+), 130 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 841e716..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,7 @@
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;
import org.json.JSONArray;
@@ -64,6 +66,8 @@
public static OkHttpClient mOkHttpClient;//okHttpClient 瀹炰緥
public static OkHttpClient mOkHttpClientSoon;//okHttpClient 瀹炰緥
+
+ public final static String API_PACKAGE_NAME = "com.youhuiquan.android";
static {
mOkHttpClient = new OkHttpClient.Builder()
@@ -119,6 +123,10 @@
params.put("page", page);
if (subId != null)
params.put("subId", subId);
+ if (UserUtil.getUid(context) != null) {
+ params.put("uid", UserUtil.getUid(context) + "");
+ }
+
commonPostWithFailture(context, BASE_URL2 + "hotsell/getList", params, handler);
}
@@ -138,23 +146,6 @@
commonPost(context, BASE_URL2 + "brand/getShopInfoV2", params, handler);
}
-
- /**
- * 鐢ㄦ埛鍗忚鎸夐挳鐩戝惉
- *
- * @param context
- * @param uid
- * @param type 0-涓嶅悓鎰� 1-鍚屾剰 2-鍚屾剰-绐楀彛鍏抽棴
- * @param handler
- */
- public static void userProtocolListener(Context context, Long uid, int type, BasicTextHttpResponseHandler handler) {
- LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
- params.put("type", type + "");
- if (uid != null) {
- params.put("uid", uid + "");
- }
- commonPost(context, BASE_URL2 + "config/userProtocolListen", params, handler);
- }
/**
* 鑾峰彇搴楅摵 瓒宠抗 /瓒宠抗鍒楄〃
@@ -241,7 +232,7 @@
LinkedHashMap<String, String> params = new LinkedHashMap<>();
if (uid != null)
params.put("uid", uid + "");
- commonPostWithFailture(context, BASE_URL2 + "recommend/getRecommendIndex", params, handler);
+ commonPostWithFailture(context, BASE_URL2 + "recommend/getRecommendIndexTJ", params, handler);
}
/**
@@ -257,6 +248,10 @@
if (!StringUtils.isEmpty(page))
params.put("page", page);
params.put("goodsType", goodsType);
+ if (UserUtil.getUid(context) != null) {
+ params.put("uid", UserUtil.getUid(context) + "");
+ }
+
commonPostWithFailture(context, BASE_URL2 + "recommend/getGoodList", params, handler);
}
@@ -369,7 +364,8 @@
public static void sendCircle(Context context, Long uid, String id,
BasicTextHttpResponseHandler handler) {
LinkedHashMap<String, String> params = new LinkedHashMap<>();
- params.put("uid", uid + "");
+ if (uid != null)
+ params.put("uid", uid + "");
params.put("id", id + "");
commonPostWithFailture(context, BASE_URL2 + "user/cloud/sendCircle", params, handler);
}
@@ -389,7 +385,8 @@
if (!LoginAndInviteStatusUtil.acessNext(context, uid, true))
return;
LinkedHashMap<String, String> params = new LinkedHashMap<>();
- params.put("uid", uid + "");
+ if (uid != null)
+ params.put("uid", uid + "");
params.put("type", type + "");
params.put("id", id);
if (goodsId != null)
@@ -410,11 +407,47 @@
*/
public static void evaluateCopyComment(Context context, Long uid, String id, String cid, BasicTextHttpResponseHandler handler) {
LinkedHashMap<String, String> params = new LinkedHashMap<>();
- params.put("uid", uid + "");
+ if (uid != null)
+ params.put("uid", uid + "");
params.put("cid", cid);
params.put("id", id);
commonPostWithFailture(context, BASE_URL2 + "dynamic/evaluateComment", params, handler);
}
+
+
+ /**
+ * 澶嶅埗鎺ㄨ崘璇�
+ *
+ * @param context
+ * @param uid
+ * @param id
+ * @param handler
+ */
+ public static void evaluateCopyRecommend(Context context, Long uid, String id, BasicTextHttpResponseHandler handler) {
+ LinkedHashMap<String, String> params = new LinkedHashMap<>();
+ if (uid != null)
+ params.put("uid", uid + "");
+ params.put("id", id);
+ commonPostWithFailture(context, BASE_URL2 + "dynamic/evaluateCopyRecommend", params, handler);
+ }
+
+
+ /**
+ * 杞摼
+ *
+ * @param context
+ * @param uid
+ * @param link
+ * @param handler
+ */
+ public static void evaluateConvertLink(Context context, Long uid, String link, BasicTextHttpResponseHandler handler) {
+ LinkedHashMap<String, String> params = new LinkedHashMap<>();
+ if (uid != null)
+ params.put("uid", uid + "");
+ params.put("link", link);
+ commonPostWithFailture(context, BASE_URL2 + "dynamic/convertLink", params, handler);
+ }
+
/**
* 棣栭〉椤堕儴鍒嗙被鍒嗙被鏁版嵁
@@ -545,6 +578,9 @@
params.put("startprice", startprice);
params.put("endprice", endprice);
params.put("totalSales", totalSales);
+ if (UserUtil.getUid(context) != null) {
+ params.put("uid", UserUtil.getUid(context) + "");
+ }
commonPostWithFailture(context, BASE_URL2 + "class/getSubGoods", params, handler);
}
@@ -558,6 +594,9 @@
LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
params.put("gcid", key);
params.put("page", page);
+ if (UserUtil.getUid(context) != null) {
+ params.put("uid", UserUtil.getUid(context) + "");
+ }
commonPostWithFailture(context, BASE_URL2 + "class/getClassGoods", params, handler);
}
@@ -666,6 +705,11 @@
if (type != null && !type.equals("") && !type.equals("null") && !type.equals("0")) {
params.put("type", type);
}
+
+ if (UserUtil.getUid(context) != null) {
+ params.put("uid", UserUtil.getUid(context) + "");
+ }
+
commonPostWithFailture(context, BASE_URL2 + "commoncontent/getNavGoodsList", params, handler);
}
@@ -681,8 +725,8 @@
LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
params.put("orderId", orderId);
params.put("userInfo.id", uid + "");
- params.put("type", type);
- commonPostWithFailture(context, BASE_URL + "lostOrder/findLostOrder", params, handler);
+ params.put("type", type + "");
+ commonPostWithFailture(context, BASE_URL2 + "lostOrder/findLostOrder", params, handler);
}
/**
@@ -698,7 +742,7 @@
LinkedHashMap<String, String> params = new LinkedHashMap<>();
params.put("text", text);
if (uid != null) params.put("uid", uid + "");
- commonPost(context, BASE_URL2 + "search/getRecommendInfo", params, handler);
+ commonPost(context, BASE_URL2 + "search/getRecommendInfoTJ", params, handler);
}
@@ -826,7 +870,7 @@
params.put("page", page);
if (type != null)
params.put("type", type);
- commonPost(context, BASE_URL + "user/msg/getMsgList", params, handler);
+ commonPost(context, BASE_URL2 + "user/msg/getMsgList", params, handler);
}
/**
@@ -989,7 +1033,7 @@
if (notifyType != null)
params.put("notifyType", notifyType);
if (uid != null) params.put("uid", uid + "");
- commonPost(context, BASE_URL2 + "search/searchGoods", params, handler);
+ commonPost(context, BASE_URL2 + "search/searchGoodsTJ", params, handler);
}
/**
@@ -1129,6 +1173,15 @@
commonPostWithFailture(context, BASE_URL + "user/bindWeiXin", params, handler);
}
+
+ public static void bindQQ(Context context, Long uid, String qqUser,
+ BasicTextHttpResponseHandler handler) {
+ LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
+ if (uid != null) params.put("uid", uid + "");
+ params.put("qqUser", qqUser);
+ commonPostWithFailture(context, BASE_URL + "user/bindQQ", params, handler);
+ }
+
/**
* app鏇存柊
*
@@ -1256,42 +1309,19 @@
commonPost1(context, BASE_URL + "customer/saveInfo", params, paramsFiles, handler);
}
- /**
- * 缁戝畾OPPO鎺ㄩ��
- *
- * @param context
- */
- public static void bindOPPOPush(Context context, Long uid, String registerId, BasicTextHttpResponseHandler handler) {
- LinkedHashMap<String, String> params = new LinkedHashMap<>();
- params.put("registerId", registerId);
- if (uid != null) params.put("uid", uid + "");
- commonPostWithFailture(context, BASE_URL + "push/registerOppo", params, handler);
- }
-
- /**
- * 缁戝畾VIVO鎺ㄩ��
- *
- * @param context
- */
- public static void bindVIVOPush(Context context, Long uid, String registerId, BasicTextHttpResponseHandler handler) {
- LinkedHashMap<String, String> params = new LinkedHashMap<>();
- params.put("regId", registerId);
- if (uid != null) params.put("uid", uid + "");
- commonPostWithFailture(context, BASE_URL + "push/registerVivo", params, handler);
- }
-
/**
* 缁戝畾XM鎺ㄩ��
*
* @param context
*/
- public static void bindXMPush(Context context, Long uid, String regId, BasicTextHttpResponseHandler handler) {
+ public static void bindPushToken(Context context, Long uid, PushRomType pushRomType, String token, BasicTextHttpResponseHandler handler) {
LinkedHashMap<String, String> params = new LinkedHashMap<>();
- params.put("regId", regId);
+ params.put("type", pushRomType.name());
+ params.put("token", token);
if (uid != null)
params.put("uid", uid + "");
- commonPostWithFailture(context, BASE_URL + "push/registerXM", params, handler);
+ commonPostWithFailture(context, BASE_URL + "push/bindToken", params, handler);
}
@@ -1329,6 +1359,12 @@
params.put("slideVerify", slideVerify);
params.put("phone", phone);
commonPostWithFailture(context, BASE_URL + "sms/sendMSMLogin", params, handler);
+ }
+
+
+ public static void allowOneKeyLogin(Context context, BasicTextHttpResponseHandler handler) {
+ LinkedHashMap<String, String> params = new LinkedHashMap<>();
+ commonPostWithFailture(context, BASE_URL + "sms/allowOneKeyLogin", params, handler);
}
/**
@@ -1458,12 +1494,23 @@
* @param context vcode鐭俊楠岃瘉鐮� phone鐢佃瘽鍙风爜 code寰俊鐧诲綍鐨刢ode
* @param handler loginType 1鐢佃瘽 2寰俊
*/
- public static void loginNew(Context context, String vcode, String phone, String code, String loginType, BasicTextHttpResponseHandler handler) {
+ public static void loginNew(Context context, String vcode, String phone, String code, String loginType, String accessToken, String qqUser, BasicTextHttpResponseHandler handler) {
LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
- params.put("vcode", vcode);
- params.put("phone", phone);
- params.put("code", code);
+ if (vcode != null)
+ params.put("vcode", vcode);
+ if (phone != null)
+ params.put("phone", phone);
+ if (code != null)
+ params.put("code", code);
params.put("loginType", loginType);
+ if (accessToken != null) {
+ params.put("aliAccessToken", accessToken);
+ }
+
+ if (qqUser != null) {
+ params.put("qqUser", qqUser);
+ }
+
commonPostWithFailture(context, BASE_URL2 + "user/login", params, handler);
}
@@ -1486,20 +1533,28 @@
* @param context vcode鐭俊楠岃瘉鐮� phone鐢佃瘽鍙风爜 code寰俊鐧诲綍鐨刢ode
* @param handler loginType 1鐢佃瘽 2寰俊
*/
- public static void bindPhoneNew(Context context, String vcode, String phone, Long uid, BasicTextHttpResponseHandler handler) {
+ public static void bindPhoneNew(Context context, String vcode, String phone, String accessToken, Long uid, BasicTextHttpResponseHandler handler) {
LinkedHashMap<String, String> params = new LinkedHashMap<>();
- params.put("vcode", vcode);
- params.put("phone", phone);
+ if (vcode != null)
+ params.put("vcode", vcode);
+ if (phone != null)
+ params.put("phone", phone);
+ if (accessToken != null)
+ params.put("aliAccessToken", accessToken);
if (uid != null) params.put("uid", uid + "");
commonPostWithFailture(context, BASE_URL + "user/bindPhoneNew", params, handler);
}
- public static void bindPhoneWithOutLogin(Context context, String vcode, String phone, String key, BasicTextHttpResponseHandler handler) {
+ public static void bindPhoneWithOutLogin(Context context, String vcode, String phone, String accessToken, String key, BasicTextHttpResponseHandler handler) {
LinkedHashMap<String, String> params = new LinkedHashMap<>();
- params.put("vcode", vcode);
- params.put("phone", phone);
+ if (vcode != null)
+ params.put("vcode", vcode);
+ if (phone != null)
+ params.put("phone", phone);
params.put("key", key);
+ if (accessToken != null)
+ params.put("aliAccessToken", accessToken);
commonPostWithFailture(context, BASE_URL2 + "user/bindPhoneLogin", params, handler);
}
@@ -1529,18 +1584,6 @@
commonPostWithFailture(context, BASE_URL + "customer/getextractprocess", params, handler);
}
- /**
- * 缁戝畾鍗庝负鎺ㄩ��
- *
- * @param context
- */
- public static void bindHMPush(Context context, String token, Long uid,
- BasicTextHttpResponseHandler handler) {
- LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
- params.put("token", token);
- if (uid != null) params.put("uid", uid + "");
- commonPostWithFailture(context, BASE_URL + "push/bindHWPush", params, handler);
- }
/**
* 鑾峰彇缃戦〉閰嶇疆淇℃伅
@@ -1654,7 +1697,8 @@
LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
if (uid != null) params.put("uid", uid + "");
params.put("auctionId", goodsId);
- params.put("from", from);
+ if (from != null)
+ params.put("from", from);
if (!StringUtils.isEmpty(source))
params.put("source", source);
commonPostWithFailture(context, BASE_URL + "goods/gettaobaolink", params, handler);
@@ -2392,6 +2436,10 @@
LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
params.put("page", page + "");
params.put("cid", cid);
+ if (UserUtil.getUid(context) != null) {
+ params.put("uid", UserUtil.getUid(context) + "");
+ }
+
commonPostWithFailture(context, BASE_URL2 + "dynamic/getList", params, handler);
}
@@ -2940,6 +2988,10 @@
params.put("page", page);
if (uid != null) params.put("uid", uid + "");
params.put("goodsType", goodsType);
+ if (UserUtil.getUid(context) != null) {
+ params.put("uid", UserUtil.getUid(context) + "");
+ }
+
commonPostWithFailture(context, BASE_URL2 + "shraeStorage/getlist", params, handler);
}
@@ -3079,6 +3131,42 @@
if (from != null)
params.put("from", from);
commonPostWithFailture(context, BuXinConstant.HOST + "/fanli/api/lijin/goods/buyWithLijin", params, handler);
+ }
+
+
+ /**
+ * 鑾峰彇鐢ㄦ埛绀奸噾鐨勫垱寤轰俊鎭�
+ *
+ * @param context
+ * @param goodsId
+ * @param goodsType
+ * @param uid
+ * @param handler
+ */
+ public static void getUserLijinCreatedInfo(Context context, String goodsId, Integer goodsType, Long uid,
+ BasicTextHttpResponseHandler handler) {
+ LinkedHashMap<String, String> params = new LinkedHashMap<>();
+ if (goodsId != null)
+ params.put("goodsId", goodsId);
+ if (goodsType != null)
+ params.put("goodsType", goodsType + "");
+ if (uid != null) params.put("uid", uid + "");
+ commonPostWithFailture(context, BuXinConstant.HOST + "/fanli/api/lijin/user/getUserLijinCreatedInfo", params, handler);
+ }
+
+
+ /**
+ * 鑾峰彇绀奸噾鐨勭敤鎴风瓑绾�
+ *
+ * @param context
+ * @param uid
+ * @param handler
+ */
+ public static void getLijinUserLevel(Context context, Long uid,
+ BasicTextHttpResponseHandler handler) {
+ LinkedHashMap<String, String> params = new LinkedHashMap<>();
+ if (uid != null) params.put("uid", uid + "");
+ commonPostWithFailture(context, BuXinConstant.HOST + "/fanli/api/lijin/user/getUserLevel", params, handler);
}
@@ -3366,6 +3454,36 @@
commonPostWithFailture(context, BASE_URL2 + "goods/listSimpleGoods", params, handler);
}
+
+ public static void getSendingHongBao(Context context,
+ BasicTextHttpResponseHandler handler) {
+ LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
+ Long uid = UserUtil.getUid(context);
+ if (uid != null)
+ params.put("uid", uid + "");
+ commonPostWithFailture(context, BASE_URL2 + "lijin/hongbao/getSendingHongBao", params, handler);
+ }
+
+ public static void getHongBaoBalance(Context context,
+ BasicTextHttpResponseHandler handler) {
+ LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
+ Long uid = UserUtil.getUid(context);
+ if (uid != null)
+ params.put("uid", uid + "");
+ commonPostWithFailture(context, BASE_URL2 + "lijin/hongbao/getHongBaoBalance", params, handler);
+ }
+
+ public static void recieveHongBao(Context context, String id,
+ BasicTextHttpResponseHandler handler) {
+ LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
+ Long uid = UserUtil.getUid(context);
+ if (uid != null)
+ params.put("uid", uid + "");
+ params.put("id", id);
+ commonPostWithFailture(context, BASE_URL2 + "lijin/hongbao/recieveHongBao", params, handler);
+ }
+
+
/**
* 鍥㈤槦璧勯噾缁熻
*
@@ -3488,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) {
@@ -3527,24 +3615,24 @@
int version = PackageUtils2.getVersionCode(context);
long time = System.currentTimeMillis();
- String deviceType = MobileUtil.getSystemModel();
- params.put("packages", "com.youhuiquan.android");
+ 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<>();
@@ -3577,23 +3665,23 @@
// }
int version = PackageUtils2.getVersionCode(context);
long time = System.currentTimeMillis();
- String deviceType = MobileUtil.getSystemModel();
- params.put("packages", "com.youhuiquan.android");
+ 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();
@@ -3636,22 +3724,22 @@
// }
int version = PackageUtils2.getVersionCode(context);
long time = System.currentTimeMillis();
- String deviceType = MobileUtil.getSystemModel();
- params.put("packages", "com.youhuiquan.android");
+ 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