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 |  967 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 540 insertions(+), 427 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 e759e90..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;
@@ -65,6 +67,8 @@
 
     public static OkHttpClient mOkHttpClientSoon;//okHttpClient 瀹炰緥
 
+    public final static String API_PACKAGE_NAME = "com.youhuiquan.android";
+
     static {
         mOkHttpClient = new OkHttpClient.Builder()
                 .connectTimeout(10 * 1000, TimeUnit.MILLISECONDS)
@@ -94,12 +98,12 @@
      * @param key
      * @param handler
      */
-    public static void getShopList(Context context, String page, String key, String uid, BasicTextHttpResponseHandler handler) {
+    public static void getShopList(Context context, String page, String key, Long uid, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("cid", key);
         params.put("page", page);
         if (uid != null) {
-            params.put("uid", uid);
+            if (uid != null) params.put("uid", uid + "");
         }
         commonPostWithFailture(context, BASE_URL2 + "brand/getList", params, handler);
     }
@@ -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);
     }
 
@@ -128,33 +136,16 @@
      * @param page 椤电爜锛�
      * @param sid  搴楅摵id
      */
-    public static void getShopInfo(Context context, String page, String sid, String uid, BasicTextHttpResponseHandler handler) {
+    public static void getShopInfo(Context context, String page, String sid, Long uid, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("page", page);
         params.put("id", sid);
         if (uid != null) {
-            params.put("uid", uid);
+            if (uid != null) params.put("uid", uid + "");
         }
         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);
-    }
 
     /**
      * 鑾峰彇搴楅摵 瓒宠抗 /瓒宠抗鍒楄〃
@@ -165,12 +156,10 @@
      * @param type    绮鹃��1锛� 瓒宠抗鍒楄〃2
      * @param handler
      */
-    public static void getHistory(Context context, String page, String uid, String type, BasicTextHttpResponseHandler handler) {
+    public static void getHistory(Context context, String page, Long uid, String type, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("page", page);
-        if (uid != null && uid.trim().length() > 0 && !uid.equalsIgnoreCase("null")) {//宸茬櫥褰曪細鐢ㄦ埛id
-            params.put("uid", uid);
-        }
+        if (uid != null) params.put("uid", uid + "");
         if (type != null && type.trim().length() > 0 && !type.equalsIgnoreCase("null")) {//绮鹃��1锛� 瓒宠抗鍒楄〃2
             params.put("type", type);
         }
@@ -185,12 +174,10 @@
      * @param uid
      * @param handler
      */
-    public static void deleteHistory(Context context, String ids, String uid, BasicTextHttpResponseHandler handler) {
+    public static void deleteHistory(Context context, String ids, Long uid, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("ids", ids);
-        if (uid != null && uid.trim().length() > 0 && !uid.equalsIgnoreCase("null")) {//宸茬櫥褰曪細鐢ㄦ埛id
-            params.put("uid", uid);
-        }
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL + "brand/deleteHistory", params, handler);
     }
 
@@ -240,12 +227,12 @@
      * @param context
      * @param handler
      */
-    public static void getRecommendIndex(Context context, String uid,
+    public static void getRecommendIndex(Context context, Long uid,
                                          BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        if (!StringUtils.isEmpty(uid))
-            params.put("uid", uid);
-        commonPostWithFailture(context, BASE_URL2 + "recommend/getRecommendIndex", params, handler);
+        if (uid != null)
+            params.put("uid", uid + "");
+        commonPostWithFailture(context, BASE_URL2 + "recommend/getRecommendIndexTJ", params, handler);
     }
 
     /**
@@ -261,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);
     }
 
@@ -270,11 +261,10 @@
      * @param context
      * @param uid
      */
-    public static void getHomeConfig(Context context, String uid,
+    public static void getHomeConfig(Context context, Long uid,
                                      BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        if (!StringUtils.isEmpty(uid))
-            params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "config/getHomeConfigNew", params, handler);
     }
 
@@ -284,19 +274,19 @@
      * @param context
      * @param uid
      */
-    public static void uploadParsedOrder(Context context, String uid, String orderData,
+    public static void uploadParsedOrder(Context context, Long uid, String orderData,
                                          BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("orderData", orderData);
         params.put("source", "unionAuth");
         commonPostWithFailture(context, BASE_URL + "user/order/uploadParsedOrder", params, handler);
     }
 
-    public static void uploadParsedOrder(Context context, String uid, String orderData, String source,
+    public static void uploadParsedOrder(Context context, Long uid, String orderData, String source,
                                          BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("orderData", orderData);
         params.put("source", source);
         commonPostWithFailture(context, BASE_URL + "user/order/uploadParsedOrder", params, handler);
@@ -374,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);
     }
@@ -391,10 +382,11 @@
      * @param handler
      */
     public static void evaluateShare(Context context, Long uid, int type, String id, Long goodsId, Integer goodsType, BasicTextHttpResponseHandler handler) {
-        if (!LoginAndInviteStatusUtil.acessNext(context, uid + "", true))
+        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)
@@ -415,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);
+    }
+
 
     /**
      * 棣栭〉椤堕儴鍒嗙被鍒嗙被鏁版嵁
@@ -427,10 +455,10 @@
      * @param context
      * @param handler
      */
-    public static void getHomeNavbar(Context context, String uid,
+    public static void getHomeNavbar(Context context, Long uid,
                                      BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "navbar/getHomeItems", params, handler);
     }
 
@@ -507,12 +535,10 @@
      * @param type    鍒楄〃鎺ュ彛杩斿洖鐨則ype
      * @param handler
      */
-    public static void getreadCommonMsg(Context context, String uid, String type, BasicTextHttpResponseHandler handler) {
+    public static void getreadCommonMsg(Context context, Long uid, String type, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("type", type);
-        if (uid != null && uid.trim().length() > 0 && !uid.equalsIgnoreCase("null")) {//褰搖id涓虹┖鐨勬椂鍊� 涓嶄紶
-            params.put("uid", uid);
-        }
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL + "user/msg/readCommonMsg", params, handler);
     }
 
@@ -526,10 +552,10 @@
      * @param id
      * @param handler
      */
-    public static void deleteMsg(Context context, String uid, String type, String id, BasicTextHttpResponseHandler handler) {
+    public static void deleteMsg(Context context, Long uid, String type, String id, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("type", type);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("id", id);
         commonPostWithFailture(context, BASE_URL + "user/msg/deleteMsg", params, handler);
     }
@@ -552,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);
     }
 
@@ -565,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);
     }
 
@@ -575,9 +607,9 @@
      * @param uid
      * @param handler
      */
-    public static void getNotReceived(Context context, String uid, BasicTextHttpResponseHandler handler) {
+    public static void getNotReceived(Context context, Long uid, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "integral/getNotReceived", params, handler);
     }
 
@@ -588,9 +620,9 @@
      * @param uid
      * @param handler
      */
-    public static void getTaskList(Context context, String uid, String page, BasicTextHttpResponseHandler handler) {
+    public static void getTaskList(Context context, Long uid, String page, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page);
         commonPostWithFailture(context, BASE_URL2 + "integral/getTaskList", params, handler);
     }
@@ -602,9 +634,9 @@
      * @param uid
      * @param handler
      */
-    public static void getReceiveGoldCoin(Context context, String uid, String type, String ids, BasicTextHttpResponseHandler handler) {
+    public static void getReceiveGoldCoin(Context context, Long uid, String type, String ids, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("type", type);
         if (!StringUtils.isEmpty(ids)) {
             params.put("ids", ids);
@@ -619,9 +651,9 @@
      * @param uid
      * @param handler
      */
-    public static void getTokenReceive(Context context, String uid, String token, BasicTextHttpResponseHandler handler) {
+    public static void getTokenReceive(Context context, Long uid, String token, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("token", token);
         commonPostWithFailture(context, BASE_URL2 + "search/tokenReceive", params, handler);
     }
@@ -633,9 +665,9 @@
      * @param uid
      * @param handler
      */
-    public static void getverifyCode(Context context, String uid, String inviteCode, BasicTextHttpResponseHandler handler) {
+    public static void getverifyCode(Context context, Long uid, String inviteCode, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("inviteCode", inviteCode);
         commonPostWithFailture(context, BASE_URL2 + "invite/verifyCode", params, handler);
     }
@@ -647,9 +679,9 @@
      * @param uid
      * @param handler
      */
-    public static void getverifyWX(Context context, String uid, String inviteCode, BasicTextHttpResponseHandler handler) {
+    public static void getverifyWX(Context context, Long uid, String inviteCode, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("code", inviteCode);
         commonPostWithFailture(context, BASE_URL2 + "invite/verifyWX", params, handler);
     }
@@ -673,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);
     }
 
@@ -684,12 +721,12 @@
      * @param handler
      * @param type    //绫诲瀷锛� 1娣樺疂 2浜笢 3鎷煎澶�
      */
-    public static void setOrderAppeal(Context context, String orderId, String uid, String type, BasicTextHttpResponseHandler handler) {
+    public static void setOrderAppeal(Context context, String orderId, Long uid, String type, BasicTextHttpResponseHandler handler) {
         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("userInfo.id", uid + "");
+        params.put("type", type + "");
+        commonPostWithFailture(context, BASE_URL2 + "lostOrder/findLostOrder", params, handler);
     }
 
     /**
@@ -698,16 +735,14 @@
      * @param context
      * @param handler
      */
-    public static void getNewGoodsInfo(Context context, String text, String uid, BasicTextHttpResponseHandler handler) {
+    public static void getNewGoodsInfo(Context context, String text, Long uid, BasicTextHttpResponseHandler handler) {
         //APP鍐呭鍒剁殑涓嶆帹鑽�
         if (text != null && ClipboardUtil.latestCopyContent != null && text.equalsIgnoreCase(ClipboardUtil.latestCopyContent.getContent()) && (System.currentTimeMillis() - ClipboardUtil.latestCopyContent.getTime()) < 1000 * 60 * 30L)
             return;
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
         params.put("text", text);
-        if (uid != null && uid.length() > 0 && !StringUtils.isEmpty(uid)) {
-            params.put("uid", uid);
-        }
-        commonPost(context, BASE_URL2 + "search/getRecommendInfo", params, handler);
+        if (uid != null) params.put("uid", uid + "");
+        commonPost(context, BASE_URL2 + "search/getRecommendInfoTJ", params, handler);
     }
 
 
@@ -726,9 +761,9 @@
      * @param context
      * @param handler
      */
-    public static void getRewardStatistics(Context context, String uid, String dateType, BasicTextHttpResponseHandler handler) {
+    public static void getRewardStatistics(Context context, Long uid, String dateType, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("dateType", dateType);
         commonPost(context, BASE_URL2 + "user/order/getBonusCount", params, handler);
     }
@@ -780,10 +815,10 @@
      *
      * @param context
      */
-    public static void setModuleState(Context context, String uid, String param,
+    public static void setModuleState(Context context, Long uid, String param,
                                       BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("params", param);
         commonPost(context, BASE_URL + "customer/setModuleState", params, handler);
     }
@@ -793,10 +828,10 @@
      *
      * @param context
      */
-    public static void getHomeMsgList(Context context, String uid, String page,
+    public static void getHomeMsgList(Context context, Long uid, String page,
                                       BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page);
         commonPost(context, BASE_URL + "user/msg/getHomeMsgListNew", params, handler);
     }
@@ -806,19 +841,19 @@
      *
      * @param context
      */
-    public static void getSystemMsgList(Context context, String uid, String page,
+    public static void getSystemMsgList(Context context, Long uid, String page,
                                         BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page);
         commonPost(context, BASE_URL + "user/msg/getSystemMsgList", params, handler);
     }
 
 
-    public static void getHongBaoSendRecordList(Context context, String uid, String page,
+    public static void getHongBaoSendRecordList(Context context, Long uid, String page,
                                                 BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page);
         commonPost(context, BASE_URL2 + "redpack/getGiveList", params, handler);
     }
@@ -828,14 +863,14 @@
      *
      * @param context
      */
-    public static void getMsgList(Context context, String uid, String page, String type,
+    public static void getMsgList(Context context, Long uid, String page, String type,
                                   BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         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);
     }
 
     /**
@@ -843,10 +878,10 @@
      *
      * @param context
      */
-    public static void getUnReadMsgCount(Context context, String uid,
+    public static void getUnReadMsgCount(Context context, Long uid,
                                          BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPost(context, BASE_URL + "user/msg/getUnReadMsgCount", params, handler);
     }
 
@@ -855,10 +890,10 @@
      *
      * @param context
      */
-    public static void setAllMsgRead(Context context, String uid,
+    public static void setAllMsgRead(Context context, Long uid,
                                      BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPost(context, BASE_URL + "user/msg/setAllMsgRead", params, handler);
     }
 
@@ -867,10 +902,10 @@
      *
      * @param context
      */
-    public static void setSystemMsgSolved(Context context, String uid, String id,
+    public static void setSystemMsgSolved(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);
         commonPost(context, BASE_URL + "user/msg/setSystemMsgSolved", params, handler);
     }
@@ -893,10 +928,10 @@
      *
      * @param context
      */
-    public static void getGoodsCouponList(Context context, String uid, int goodsType, String goodsId,
+    public static void getGoodsCouponList(Context context, Long uid, int goodsType, String goodsId,
                                           BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("goodsId", goodsId);
         params.put("goodsType", goodsType + "");
         commonPostWithFailture(context, BASE_URL + "user/coupon/getFreeCouponList", params, handler);
@@ -907,10 +942,10 @@
      *
      * @param context
      */
-    public static void getOrderCouponList(Context context, String uid, String orderNo,
+    public static void getOrderCouponList(Context context, Long uid, String orderNo,
                                           BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("orderNo", orderNo);
         commonPostWithFailture(context, BASE_URL2 + "user/coupon/getOrderCouponList", params, handler);
     }
@@ -948,10 +983,10 @@
      *
      * @param context uid
      */
-    public static void getShareRecord(Context context, String uid, String page, String source,
+    public static void getShareRecord(Context context, Long uid, String page, String source,
                                       BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page);
         params.put("source", source);
         commonPost(context, BASE_URL + "share/getlistrecord", params, handler);
@@ -988,7 +1023,7 @@
      * @param context
      */
     public static void search(Context context, String kw, String page, String fillter, String goodsType,
-                              String order, String uid, String notifyType, BasicTextHttpResponseHandler handler) {
+                              String order, Long uid, String notifyType, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("key", kw);
         params.put("page", page);
@@ -997,9 +1032,8 @@
         params.put("order", order);
         if (notifyType != null)
             params.put("notifyType", notifyType);
-        if (!StringUtils.isEmpty(uid))
-            params.put("uid", uid);
-        commonPost(context, BASE_URL2 + "search/searchGoods", params, handler);
+        if (uid != null) params.put("uid", uid + "");
+        commonPost(context, BASE_URL2 + "search/searchGoodsTJ", params, handler);
     }
 
     /**
@@ -1009,10 +1043,9 @@
      * @param uid
      * @param handler
      */
-    public static void getFirstGuide(Context context, String uid, BasicTextHttpResponseHandler handler) {
+    public static void getFirstGuide(Context context, Long uid, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        if (!StringUtils.isEmpty(uid))
-            params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPost(context, BASE_URL2 + "recommend/getGuide", params, handler);
     }
 
@@ -1052,9 +1085,9 @@
      * @param uid
      * @param handler
      */
-    public static void setRecordBind(Context context, String uid, BasicTextHttpResponseHandler handler) {
+    public static void setRecordBind(Context context, Long uid, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPost(context, BASE_URL2 + "user/recordBind", params, handler);
     }
 
@@ -1063,10 +1096,10 @@
      *
      * @param context
      */
-    public static void getMailList(Context context, String uid, String page,
+    public static void getMailList(Context context, Long uid, String page,
                                    BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page);
         commonPost(context, BASE_URL + "customer/findAccountMessageList", params, handler);
     }
@@ -1093,11 +1126,10 @@
      *
      * @param context
      */
-    public static void updateComplaint(Context context, String uid, String content, File[] files,
+    public static void updateComplaint(Context context, Long uid, String content, File[] files,
                                        BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        if (!StringUtils.isEmpty(uid))
-            params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("content", content);
         if (files != null && files.length > 0) {
             LinkedHashMap<String, File[]> params1 = new LinkedHashMap<>();
@@ -1116,12 +1148,11 @@
      * @param files   鍥剧墖
      * @param handler
      */
-    public static void uploadPortrait(Context context, String uid, File[] files,
+    public static void uploadPortrait(Context context, Long uid, File[] files,
                                       BasicTextHttpResponseHandler handler) {
 
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        if (!StringUtils.isEmpty(uid))
-            params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         if (files != null) {
             LinkedHashMap<String, File[]> params1 = new LinkedHashMap<>();
             params1.put("file", files);
@@ -1134,12 +1165,21 @@
      *
      * @param context
      */
-    public static void bindWeiXin(Context context, String uid, String code,
+    public static void bindWeiXin(Context context, Long uid, String code,
                                   BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("code", code);
         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);
     }
 
     /**
@@ -1172,10 +1212,10 @@
      *
      * @param context
      */
-    public static void getLostOrderList(Context context, String uid, String page,
+    public static void getLostOrderList(Context context, Long uid, String page,
                                         BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page);
         commonPost(context, BASE_URL + "lostOrder/getLostOrderList", params, handler);
     }
@@ -1185,10 +1225,10 @@
      *
      * @param context
      */
-    public static void deleteLostOrder(Context context, String uid, String id,
+    public static void deleteLostOrder(Context context, Long uid, String id,
                                        BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("id", id);
         commonPost(context, BASE_URL + "lostOrder/deleteLostOrder", params, handler);
     }
@@ -1198,10 +1238,10 @@
      *
      * @param context
      */
-    public static void deleteAllLostOrder(Context context, String uid,
+    public static void deleteAllLostOrder(Context context, Long uid,
                                           BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPost(context, BASE_URL + "lostOrder/deleteAllLostOrder", params, handler);
     }
 
@@ -1233,10 +1273,10 @@
      *
      * @param context
      */
-    public static void getTaoBaoCartConfig(Context context, String uid, String position,
+    public static void getTaoBaoCartConfig(Context context, Long uid, String position,
                                            BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("position", position);
         commonPost(context, BASE_URL + "config/getTaoBaoCartConfig", params, handler);
     }
@@ -1246,10 +1286,10 @@
      *
      * @param context
      */
-    public static void saveInfo(Context context, String uid, String nickName, String weiXin,
+    public static void saveInfo(Context context, Long uid, String nickName, String weiXin,
                                 Integer sex, String inviteCode, File wxErCode, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         if (!StringUtils.isEmpty(nickName))
             params.put("nickName", nickName);
         if (!StringUtils.isEmpty(weiXin))
@@ -1269,44 +1309,19 @@
         commonPost1(context, BASE_URL + "customer/saveInfo", params, paramsFiles, handler);
     }
 
-    /**
-     * 缁戝畾OPPO鎺ㄩ��
-     *
-     * @param context
-     */
-    public static void bindOPPOPush(Context context, String uid, String registerId, BasicTextHttpResponseHandler handler) {
-        LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("registerId", registerId);
-        if (!StringUtils.isEmpty(uid))
-            params.put("uid", uid);
-        commonPostWithFailture(context, BASE_URL + "push/registerOppo", params, handler);
-    }
-
-    /**
-     * 缁戝畾VIVO鎺ㄩ��
-     *
-     * @param context
-     */
-    public static void bindVIVOPush(Context context, String uid, String registerId, BasicTextHttpResponseHandler handler) {
-        LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("regId", registerId);
-        if (!StringUtils.isEmpty(uid))
-            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);
     }
 
 
@@ -1315,9 +1330,9 @@
      *
      * @param context
      */
-    public static void loginOut(Context context, String uid, BasicTextHttpResponseHandler handler) {
+    public static void loginOut(Context context, Long uid, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL + "user/logout", params, handler);
     }
 
@@ -1326,10 +1341,10 @@
      *
      * @param context
      */
-    public static void sendSms(Context context, String uid, String phone, String type, BasicTextHttpResponseHandler handler) {
+    public static void sendSms(Context context, Long uid, String phone, String type, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("phone", phone);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("type", type);
         commonPostWithFailture(context, BASE_URL + "sms/sendSMS", params, handler);
     }
@@ -1344,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);
     }
 
     /**
@@ -1431,9 +1452,9 @@
      * @param context
      * @param handler
      */
-    public static void bindPhone(Context context, String uid, String vcode, String phone, BasicTextHttpResponseHandler handler) {
+    public static void bindPhone(Context context, Long uid, String vcode, String phone, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("vcode", vcode);
         params.put("phone", phone);
         commonPostWithFailture(context, BASE_URL + "user/bindPhone", params, handler);
@@ -1445,9 +1466,9 @@
      * @param context
      * @param handler
      */
-    public static void addZhifubaoAccount(Context context, String uid, String name, String account, BasicTextHttpResponseHandler handler) {
+    public static void addZhifubaoAccount(Context context, Long uid, String name, String account, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("name", name);
         params.put("account", account);
         commonPostWithFailture(context, BASE_URL + "user/bindalipaywithverifynew", params, handler);
@@ -1459,9 +1480,9 @@
      * @param context
      * @param handler
      */
-    public static void verifyvcodeforbind(Context context, String uid, String vcode, String phone, BasicTextHttpResponseHandler handler) {
+    public static void verifyvcodeforbind(Context context, Long uid, String vcode, String phone, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("vcode", vcode);
         params.put("phone", phone);
         commonPostWithFailture(context, BASE_URL + "user/verifyvcodeforbind", params, handler);
@@ -1473,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);
     }
 
@@ -1501,20 +1533,28 @@
      * @param context vcode鐭俊楠岃瘉鐮� phone鐢佃瘽鍙风爜  code寰俊鐧诲綍鐨刢ode
      * @param handler loginType 1鐢佃瘽 2寰俊
      */
-    public static void bindPhoneNew(Context context, String vcode, String phone, String 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);
-        params.put("uid", uid);
+        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);
     }
 
@@ -1524,9 +1564,9 @@
      * @param context
      * @param handler
      */
-    public static void unbindPhone(Context context, String uid, String phone, BasicTextHttpResponseHandler handler) {
+    public static void unbindPhone(Context context, Long uid, String phone, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("phone", phone);
         commonPostWithFailture(context, BASE_URL + "user/unBindPhone", params, handler);
     }
@@ -1536,26 +1576,14 @@
      *
      * @param context
      */
-    public static void getExtractProcess(Context context, String id, String uid,
+    public static void getExtractProcess(Context context, String id, Long uid,
                                          BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("id", id);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL + "customer/getextractprocess", params, handler);
     }
 
-    /**
-     * 缁戝畾鍗庝负鎺ㄩ��
-     *
-     * @param context
-     */
-    public static void bindHMPush(Context context, String token, String uid,
-                                  BasicTextHttpResponseHandler handler) {
-        LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("token", token);
-        params.put("uid", uid);
-        commonPostWithFailture(context, BASE_URL + "push/bindHWPush", params, handler);
-    }
 
     /**
      * 鑾峰彇缃戦〉閰嶇疆淇℃伅
@@ -1587,10 +1615,10 @@
      *
      * @param context
      */
-    public static void getExchangeList(Context context, String uid, String page,
+    public static void getExchangeList(Context context, Long uid, String page,
                                        BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page);
         commonPostWithFailture(context, BASE_URL2 + "integral/getExchangeList", params, handler);
     }
@@ -1600,10 +1628,10 @@
      *
      * @param context
      */
-    public static void goExchangeGoodsVerify(Context context, String uid, String id,
+    public static void goExchangeGoodsVerify(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 + "integral/verifyExchange", params, handler);
     }
@@ -1613,10 +1641,10 @@
      *
      * @param context
      */
-    public static void goExchangeGoods(Context context, String uid, String id,
+    public static void goExchangeGoods(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 + "integral/exchange", params, handler);
     }
@@ -1638,10 +1666,10 @@
      *
      * @param context
      */
-    public static void inviteCodeExchangeVerify(Context context, String uid, String id,
+    public static void inviteCodeExchangeVerify(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 + "integral/verifyInviteCode", params, handler);
     }
@@ -1651,10 +1679,10 @@
      *
      * @param context
      */
-    public static void inviteCodeExchange(Context context, String uid, String id,
+    public static void inviteCodeExchange(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 + "integral/exchangeInviteCode", params, handler);
     }
@@ -1664,13 +1692,13 @@
      *
      * @param context
      */
-    public static void getTBLinkInfo(Context context, String uid, String goodsId, String from, String source,
+    public static void getTBLinkInfo(Context context, Long uid, String goodsId, String from, String source,
                                      BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        if (!StringUtils.isNullOrEmpty(uid))
-            params.put("uid", uid);
+        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);
@@ -1681,13 +1709,13 @@
      *
      * @param context
      */
-    public static void getJDLinkInfo(Context context, String uid, String goodsId, String from, String source, String couponLink,
+    public static void getJDLinkInfo(Context context, Long uid, String goodsId, String from, String source, String couponLink,
                                      BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        if (!StringUtils.isNullOrEmpty(uid))
-            params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("id", goodsId);
-        params.put("from", from);
+        if (from != null)
+            params.put("from", from);
         if (!StringUtils.isEmpty(source))
             params.put("source", source);
         if (!StringUtils.isEmpty(couponLink))
@@ -1696,12 +1724,11 @@
     }
 
 
-    public static void getVIPLinkInfo(Context context, String uid, String goodsId, String from, String source,
+    public static void getVIPLinkInfo(Context context, Long uid, String goodsId, String from, String source,
                                       BasicTextHttpResponseHandler handler) {
 
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        if (!StringUtils.isNullOrEmpty(uid))
-            params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("id", goodsId);
         params.put("from", from);
         if (!StringUtils.isEmpty(source))
@@ -1710,12 +1737,11 @@
     }
 
 
-    public static void getSuningLinkInfo(Context context, String uid, String goodsId, String from, String source,
+    public static void getSuningLinkInfo(Context context, Long uid, String goodsId, String from, String source,
                                          BasicTextHttpResponseHandler handler) {
 
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        if (!StringUtils.isNullOrEmpty(uid))
-            params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("id", goodsId);
         params.put("from", from);
         if (!StringUtils.isEmpty(source))
@@ -1742,12 +1768,11 @@
      *
      * @param context
      */
-    public static void getPDDLinkInfo(Context context, String uid, String goodsId, String from, String source,
+    public static void getPDDLinkInfo(Context context, Long uid, String goodsId, String from, String source,
                                       BasicTextHttpResponseHandler handler) {
 
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        if (!StringUtils.isNullOrEmpty(uid))
-            params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("id", goodsId);
         params.put("from", from);
         if (!StringUtils.isEmpty(source))
@@ -1755,14 +1780,25 @@
         commonPostWithFailture(context, BASE_URL2 + "goods/getPDDLink", params, handler);
     }
 
-    public static void getPDDAuthInfo(Context context, String uid, boolean buy,
+    public static void getPDDAuthInfo(Context context, Long uid, boolean buy,
                                       BasicTextHttpResponseHandler handler) {
         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", (buy ? 1 : 2) + "");
         commonPostWithFailture(context, BASE_URL2 + "pdd/getAuthJumpInfo", params, handler);
+    }
+
+    //鎷煎澶氭槸鍚﹀凡缁忔巿鏉�
+    public static void isPDDAuthed(Context context, Long uid, boolean buy,
+                                   BasicTextHttpResponseHandler handler) {
+        if (!LoginAndInviteStatusUtil.acessNext(context, uid, true))
+            return;
+        LinkedHashMap<String, String> params = new LinkedHashMap<>();
+        if (uid != null) params.put("uid", uid + "");
+        params.put("type", (buy ? 1 : 2) + "");
+        commonPostWithFailture(context, BASE_URL2 + "pdd/isAuth", params, handler);
     }
 
 
@@ -1771,13 +1807,12 @@
      *
      * @param context
      */
-    public static void deleteRecommendGoods(Context context, String goodsId, String uid, String reason, int source,
+    public static void deleteRecommendGoods(Context context, String goodsId, Long uid, String reason, int source,
                                             BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
         params.put("goodsId", goodsId);
         params.put("source", source + "");
-        if (!StringUtils.isNullOrEmpty(uid))
-            params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         if (!StringUtils.isEmpty(reason))
             params.put("reason", reason);
         commonPostWithFailture(context, BASE_URL + "goods/deleteRecommendGoods", params, handler);
@@ -1811,12 +1846,12 @@
      *
      * @param context
      */
-    public static void createShareLink(Context context, String uid, String goodsId, String goodsType, String source,
+    public static void createShareLink(Context context, Long uid, String goodsId, String goodsType, String source,
                                        String totalNum, Boolean needGoods, BasicTextHttpResponseHandler handler) {
         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("goodsId", goodsId);
         params.put("goodsType", goodsType);
         if (!StringUtils.isEmpty(source))
@@ -1835,13 +1870,12 @@
      *
      * @param context
      */
-    public static void getTaoBaoAuthInfo(Context context, String uid, String goodsId, String source, boolean first,
+    public static void getTaoBaoAuthInfo(Context context, Long uid, String goodsId, String source, boolean first,
                                          BasicTextHttpResponseHandler handler) {
         if (!LoginAndInviteStatusUtil.acessNext(context, uid, true))
             return;
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        if (!StringUtils.isEmpty(uid))
-            params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         if (goodsId != null)
             params.put("goodsId", goodsId);
         params.put("source", source);
@@ -1854,10 +1888,10 @@
      *
      * @param context
      */
-    public static void getMoneyStatistic(Context context, String uid,
+    public static void getMoneyStatistic(Context context, Long uid,
                                          BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "usermoney/getMoneyStatistic", params, handler);
     }
 
@@ -1867,10 +1901,10 @@
      *
      * @param context
      */
-    public static void getUserMoneyInfo(Context context, String uid,
+    public static void getUserMoneyInfo(Context context, Long uid,
                                         BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "usermoney/getUserMoneyInfo", params, handler);
     }
 
@@ -1882,10 +1916,10 @@
      * @param page
      * @param handler
      */
-    public static void getExtractRecord(Context context, String uid, int page,
+    public static void getExtractRecord(Context context, Long uid, int page,
                                         BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page + "");
         commonPostWithFailture(context, BASE_URL2 + "usermoney/getExtractRecord", params, handler);
     }
@@ -1899,10 +1933,10 @@
      * @param date
      * @param handler
      */
-    public static void getHistoryDetail(Context context, String uid, int dateType, String date,
+    public static void getHistoryDetail(Context context, Long uid, int dateType, String date,
                                         BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("datetype", dateType + "");
         if (date != null)
             params.put("date", date);
@@ -1914,11 +1948,11 @@
      *
      * @param context
      */
-    public static void viewShareTextTemplate(Context context, String uid, String goodsId,
+    public static void viewShareTextTemplate(Context context, Long uid, String goodsId,
                                              String hasCoupon, String template, String tljId,
                                              int goodsType, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("goodsId", goodsId);
         params.put("hasCoupon", hasCoupon);
         params.put("goodsType", goodsType + "");
@@ -1934,10 +1968,10 @@
      *
      * @param context
      */
-    public static void getShareTextTemplate(Context context, String uid, String hasCoupon,
+    public static void getShareTextTemplate(Context context, Long uid, String hasCoupon,
                                             String tljId, int goodsType, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("hasCoupon", hasCoupon);
         params.put("goodsType", goodsType + "");
         if (!StringUtils.isEmpty(tljId)) {
@@ -1965,11 +1999,11 @@
      *
      * @param context
      */
-    public static void saveShareTextTemplate(Context context, String uid, String hasCoupon,
+    public static void saveShareTextTemplate(Context context, Long uid, String hasCoupon,
                                              String template, String tljId, int goodsType,
                                              BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("hasCoupon", hasCoupon);
         params.put("template", template);
         params.put("goodsType", goodsType + "");
@@ -1983,11 +2017,11 @@
      *
      * @param context
      */
-    public static void resetShareTextTemplate(Context context, String uid, String hasCoupon,
+    public static void resetShareTextTemplate(Context context, Long uid, String hasCoupon,
                                               String goodsId, String tljId, int goodsType,
                                               BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("hasCoupon", hasCoupon);
         params.put("goodsId", goodsId);
         params.put("goodsType", goodsType + "");
@@ -2037,11 +2071,11 @@
      *
      * @param context
      */
-    public static void getOrderList1(Context context, String page, String uid, Integer state,
+    public static void getOrderList1(Context context, String page, Long uid, Integer state,
                                      BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
         params.put("page", page);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("state", state + "");
 
         commonPostWithFailture(context, BASE_URL2 + "user/order/getOrderList", params, handler);
@@ -2053,13 +2087,13 @@
      *
      * @param context
      */
-    public static void getOrderList2(Context context, String page, String uid, String orderState,
+    public static void getOrderList2(Context context, String page, Long uid, String orderState,
                                      String type, String startTime, String endTime, Integer slotTime,
                                      String needCount, Integer dateType, Integer goodsType, String state,
                                      BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("page", page);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         if (!StringUtils.isEmpty(orderState))
             params.put("orderState", orderState);
         if (!StringUtils.isEmpty(type))
@@ -2086,11 +2120,11 @@
      *
      * @param context
      */
-    public static void getOrderList3(Context context, String page, String uid, String orderNo,
+    public static void getOrderList3(Context context, String page, Long uid, String orderNo,
                                      BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("page", page);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("orderNo", orderNo);
         commonPostWithFailture(context, BASE_URL2 + "user/order/getOrderList", params, handler);
     }
@@ -2100,10 +2134,10 @@
      *
      * @param context
      */
-    public static void getRankInfo(Context context, String uid,
+    public static void getRankInfo(Context context, Long uid,
                                    BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL + "customer/getRankInfo", params, handler);
     }
 
@@ -2112,10 +2146,10 @@
      *
      * @param context
      */
-    public static void getOrderStatistics(Context context, String uid, int goodsType,
+    public static void getOrderStatistics(Context context, Long uid, int goodsType,
                                           BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("type", goodsType + "");
         commonPostWithFailture(context, BASE_URL2 + "user/order/getOrderCount", params, handler);
     }
@@ -2125,11 +2159,11 @@
      *
      * @param context
      */
-    public static void getWelfareCenterList(Context context, String page, String uid,
+    public static void getWelfareCenterList(Context context, String page, Long uid,
                                             BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
         params.put("page", page);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "user/coupon/getCouponList", params, handler);
     }
 
@@ -2138,10 +2172,10 @@
      *
      * @param context
      */
-    public static void sendCoupon(Context context, String uid, String id,
+    public static void sendCoupon(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/coupon/giveCoupon", params, handler);
     }
@@ -2152,11 +2186,10 @@
      *
      * @param context
      */
-    public static void getSpecialActivity(Context context, String uid,
+    public static void getSpecialActivity(Context context, Long uid,
                                           BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        if (!StringUtils.isEmpty(uid))
-            params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL + "user/getSpecialActivities", params, handler);
     }
 
@@ -2192,12 +2225,12 @@
      *
      * @param context
      */
-    public static void useFreeSingleTicket(Context context, String uid, String cid, String goodId,
+    public static void useFreeSingleTicket(Context context, Long uid, String cid, String goodId,
                                            BasicTextHttpResponseHandler handler) {
         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("cid", cid);
         params.put("goodId", goodId);
         commonPostWithFailture(context, BASE_URL + "user/coupon/useFreeCoupon", params, handler);
@@ -2208,10 +2241,10 @@
      *
      * @param context
      */
-    public static void useRewardTicket(Context context, String uid, String cid, String orderNo,
+    public static void useRewardTicket(Context context, Long uid, String cid, String orderNo,
                                        int goodsType, 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("orderNo", orderNo);
         params.put("goodsType", goodsType + "");
@@ -2224,10 +2257,10 @@
      *
      * @param context
      */
-    public static void getUserInfo2(Context context, String uid,
+    public static void getUserInfo2(Context context, Long uid,
                                     BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL + "customer/getuserinfoNew", params, handler);
     }
 
@@ -2239,9 +2272,9 @@
      * @param code    婵�娲荤爜
      * @param handler
      */
-    public static void getActivationInvite(Context context, String uid, String code, BasicTextHttpResponseHandler handler) {
+    public static void getActivationInvite(Context context, Long uid, String code, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("inviteCode", code);
         commonPostWithFailture(context, BASE_URL + "invite/activationInvite", params, handler);
     }
@@ -2254,9 +2287,9 @@
      * @param code
      * @param handler
      */
-    public static void getActivationInviteWX(Context context, String uid, String code, BasicTextHttpResponseHandler handler) {
+    public static void getActivationInviteWX(Context context, Long uid, String code, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("key", code);
         commonPostWithFailture(context, BASE_URL2 + "invite/activeInviteWX", params, handler);
     }
@@ -2267,11 +2300,11 @@
      *
      * @param context
      */
-    public static void getUserMoneyDetailList(Context context, String uid, String index,
+    public static void getUserMoneyDetailList(Context context, Long uid, String index,
                                               String year, String month, int type,
                                               BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         if (!StringUtils.isEmpty(index))
             params.put("index", index);
         if (!StringUtils.isEmpty(year))
@@ -2292,10 +2325,10 @@
      * @param type
      * @param handler
      */
-    public static void getIncomeDetail(Context context, String uid, int dateType, String date, int type,
+    public static void getIncomeDetail(Context context, Long uid, int dateType, String date, int type,
                                        BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("datetype", dateType + "");
         params.put("date", date);
         params.put("type", type + "");
@@ -2307,11 +2340,11 @@
      *
      * @param context
      */
-    public static void getMoneyDetails(Context context, String uid, String index,
+    public static void getMoneyDetails(Context context, Long uid, String index,
                                        String year, String month,
                                        BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         if (!StringUtils.isEmpty(index))
             params.put("index", index);
         if (!StringUtils.isEmpty(year))
@@ -2326,11 +2359,11 @@
      *
      * @param context
      */
-    public static void getGoldDetails(Context context, String uid, String index,
+    public static void getGoldDetails(Context context, Long uid, String index,
                                       String year, String month, String type,
                                       BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         if (!StringUtils.isEmpty(index))
             params.put("index", index);
         if (!StringUtils.isEmpty(year))
@@ -2347,11 +2380,11 @@
      *
      * @param context
      */
-    public static void extractmoneynew(Context context, String money, String uid, String vcode, String type,
+    public static void extractmoneynew(Context context, String money, Long uid, String vcode, String type,
                                        BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("money", money);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("vcode", vcode);
         params.put("type", type);
         commonPostWithFailture(context, BASE_URL + "customer/extractmoneynew", params, handler);
@@ -2378,10 +2411,10 @@
      *
      * @param context
      */
-    public static void shareTrends(Context context, String uid, String activityId,
+    public static void shareTrends(Context context, Long uid, String activityId,
                                    BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         if (!StringUtils.isEmpty(activityId)) {
             params.put("id", activityId);
         }
@@ -2403,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);
     }
 
@@ -2480,10 +2517,10 @@
      *
      * @param context
      */
-    public static void getRemindTeam(Context context, String uid, String inviteId,
+    public static void getRemindTeam(Context context, Long uid, String inviteId,
                                      BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("inviteId", inviteId);
 //        commonPostWithFailture(context, BASE_URL + "customer/getMyTeam", params, handler);
         commonPostWithFailture(context, BASE_URL2 + "invite/remindTeam", params, handler);
@@ -2496,10 +2533,10 @@
      *
      * @param context
      */
-    public static void getCountMyTeam(Context context, String uid,
+    public static void getCountMyTeam(Context context, Long uid,
                                       BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "invite/countMyTeam", params, handler);
     }
 
@@ -2511,10 +2548,10 @@
      * @param workerId
      * @param handler
      */
-    public static void getFansInfo(Context context, String uid, String workerId,
+    public static void getFansInfo(Context context, Long uid, String workerId,
                                    BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("workerId", workerId);
         commonPostWithFailture(context, BASE_URL2 + "invite/getFansInfo", params, handler);
     }
@@ -2529,10 +2566,10 @@
      * @param info    -绛涢�夋潯浠�
      * @param handler
      */
-    public static void getMyTeamV2(Context context, String uid, int page, String key, int type, TeamScreenInfo info,
+    public static void getMyTeamV2(Context context, Long uid, int page, String key, int type, TeamScreenInfo info,
                                    BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page + "");
         params.put("type", type + "");
         if (!StringUtils.isEmpty(key)) {
@@ -2560,10 +2597,10 @@
      *
      * @param context
      */
-    public static void saveMemoName(Context context, String uid, String inviteId, String memoName,
+    public static void saveMemoName(Context context, Long uid, String inviteId, String memoName,
                                     BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("inviteId", inviteId);
         params.put("memoName", memoName);
         commonPostWithFailture(context, BASE_URL + "customer/setextrainfo", params, handler);
@@ -2578,10 +2615,10 @@
      * @param tags
      * @param handler
      */
-    public static void saveTags(Context context, String uid, String workerId, String tags,
+    public static void saveTags(Context context, Long uid, String workerId, String tags,
                                 BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("workerId", workerId);
         params.put("tags", tags);
         commonPostWithFailture(context, BASE_URL2 + "invite/saveTags", params, handler);
@@ -2593,10 +2630,10 @@
      *
      * @param context
      */
-    public static void getInviteImg(Context context, String uid, String activityId,
+    public static void getInviteImg(Context context, Long uid, String activityId,
                                     BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("activityId", activityId);
         commonPostWithFailture(context, BASE_URL + "activity/inviteImg", params, handler);
     }
@@ -2606,11 +2643,11 @@
      *
      * @param context
      */
-    public static void getPushRecommendhistory(Context context, String page, String uid, String deviceToken,
+    public static void getPushRecommendhistory(Context context, String page, Long uid, String deviceToken,
                                                BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("page", page);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("deviceToken", deviceToken);
         commonPostWithFailture(context, BASE_URL + "push/gethistory", params, handler);
     }
@@ -2705,10 +2742,10 @@
      *
      * @param context
      */
-    public static void canExtract(Context context, String uid, String money,
+    public static void canExtract(Context context, Long uid, String money,
                                   BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("money", money);
         commonPostWithFailture(context, BASE_URL + "customer/canextract", params, handler);
     }
@@ -2720,10 +2757,10 @@
      * @param uid     鐢ㄦ埛id
      * @param handler
      */
-    public static void getcountHongBao(Context context, String uid,
+    public static void getcountHongBao(Context context, Long uid,
                                        BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "redpack/countInfo", params, handler);
     }
 
@@ -2734,10 +2771,10 @@
      * @param uid     鐢ㄦ埛id
      * @param handler
      */
-    public static void giveTLJ(Context context, String uid, String amount,
+    public static void giveTLJ(Context context, Long uid, String amount,
                                BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("amount", amount);
         commonPostWithFailture(context, BASE_URL2 + "redpack/giving", params, handler);
     }
@@ -2749,10 +2786,10 @@
      * @param uid     鐢ㄦ埛id
      * @param handler
      */
-    public static void exchangeCash(Context context, String uid, String amount,
+    public static void exchangeCash(Context context, Long uid, String amount,
                                     BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("amount", amount);
         commonPostWithFailture(context, BASE_URL2 + "redpack/exchangeCash", params, handler);
     }
@@ -2775,13 +2812,11 @@
      * @param uid     鐢ㄦ埛id
      * @param handler
      */
-    public static void getHongbaoDetails(Context context, String uid,
+    public static void getHongbaoDetails(Context context, Long uid,
                                          BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
 //        params.put("type", type);
-        if (uid != null && uid.trim().length() > 0 && !uid.equalsIgnoreCase("null")) {//褰搖id涓虹┖鐨勬椂鍊� 涓嶄紶
-            params.put("uid", uid);
-        }
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "taolijin/getWinDetail", params, handler);
     }
 
@@ -2792,10 +2827,10 @@
      * @param uid     鐢ㄦ埛id
      * @param handler
      */
-    public static void getMSGConfig(Context context, String uid,
+    public static void getMSGConfig(Context context, Long uid,
                                     BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL + "config/getMSGConfig", params, handler);
     }
 
@@ -2807,10 +2842,10 @@
      * @param page    椤电爜锛�1
      * @param handler
      */
-    public static void getv2ShareRecord(Context context, String uid, String page,
+    public static void getv2ShareRecord(Context context, Long uid, String page,
                                         BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page);
         commonPostWithFailture(context, BASE_URL2 + "taolijin/getShareRecord", params, handler);
     }
@@ -2820,10 +2855,10 @@
      *
      * @param context
      */
-    public static void openMessage(Context context, String uid, String id,
+    public static void openMessage(Context context, Long uid, String id,
                                    BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("id", id);
         commonPostWithFailture(context, BASE_URL + "customer/openAccountMessage", params, handler);
     }
@@ -2834,10 +2869,10 @@
      *
      * @param context
      */
-    public static void getUserAccount(Context context, String uid,
+    public static void getUserAccount(Context context, Long uid,
                                       BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL + "customer/getuseraccount", params, handler);
     }
 
@@ -2846,10 +2881,10 @@
      *
      * @param context
      */
-    public static void getZFBInfo(Context context, String uid,
+    public static void getZFBInfo(Context context, Long uid,
                                   BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL + "customer/getalipayaccount", params, handler);
     }
 
@@ -2867,11 +2902,11 @@
      *
      * @param context
      */
-    public static void getCollectioList(Context context, String page, String uid,
+    public static void getCollectioList(Context context, String page, Long uid,
                                         BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("page", page);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "consumer/collectionGoodsList", params, handler);
     }
 
@@ -2892,11 +2927,11 @@
      *
      * @param context
      */
-    public static void deleteCollect(Context context, String ids, String type, String uid,
+    public static void deleteCollect(Context context, String ids, String type, Long uid,
                                      BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("ids", ids);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("type", type);
         commonPostWithFailture(context, BASE_URL2 + "consumer/deleteCollectionGoods", params, handler);
     }
@@ -2906,10 +2941,10 @@
      *
      * @param context
      */
-    public static void addSelection(Context context, String uid, String auctionIds,
+    public static void addSelection(Context context, Long uid, String auctionIds,
                                     BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("ids", auctionIds);
         commonPostWithFailture(context, BASE_URL2 + "shraeStorage/addStorage", params, handler);
     }
@@ -2919,11 +2954,11 @@
      *
      * @param context
      */
-    public static void getFootmark(Context context, String page, String uid,
+    public static void getFootmark(Context context, String page, Long uid,
                                    BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("page", page);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "consumer/getScanHistory", params, handler);
     }
 
@@ -2932,11 +2967,11 @@
      *
      * @param context
      */
-    public static void deleteFootmark(Context context, String ids, String type, String uid,
+    public static void deleteFootmark(Context context, String ids, String type, Long uid,
                                       BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("ids", ids);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("type", type);
         commonPostWithFailture(context, BASE_URL2 + "consumer/deleteScanhistory", params, handler);
     }
@@ -2947,12 +2982,16 @@
      * @param context
      * @param goodsType 骞冲彴锛� 1娣樺疂 2浜笢 3鎷煎澶�
      */
-    public static void getSelectioStoreHouseList(Context context, String page, String uid, String goodsType,
+    public static void getSelectioStoreHouseList(Context context, String page, Long uid, String goodsType,
                                                  BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("page", page);
-        params.put("uid", uid);
+        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);
     }
 
@@ -2961,11 +3000,11 @@
      *
      * @param context
      */
-    public static void deleteSelectStoreHouse(Context context, String ids, String uid,
+    public static void deleteSelectStoreHouse(Context context, String ids, Long uid,
                                               BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("storageIds", ids);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL + "userstorage/deletestorage", params, handler);
     }
 
@@ -2974,11 +3013,11 @@
      *
      * @param context
      */
-    public static void shareSelectStoreHouse(Context context, String ids, String uid, int goodsType,
+    public static void shareSelectStoreHouse(Context context, String ids, Long uid, int goodsType,
                                              BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("storageIds", ids);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("goodsType", goodsType + "");
         commonPostWithFailture(context, BASE_URL2 + "shraeStorage/createShare", params, handler);
     }
@@ -2989,13 +3028,13 @@
      *
      * @param context id 鍟嗗搧ID
      */
-    public static void collectionGoods(Context context, String id, String uid, String type, String goodsType,
+    public static void collectionGoods(Context context, String id, Long uid, String type, String goodsType,
                                        BasicTextHttpResponseHandler handler) {
         if (!LoginAndInviteStatusUtil.acessNext(context, uid, true))
             return;
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("id", id);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("type", type);
         params.put("goodsType", goodsType);
         commonPostWithFailture(context, BASE_URL2 + "consumer/collectionGoods", params, handler);
@@ -3006,25 +3045,25 @@
      *
      * @param context id 鍟嗗搧ID
      */
-    public static void addSelectionStoreHouse(Context context, String id, String uid, String goodsType,
+    public static void addSelectionStoreHouse(Context context, String id, Long uid, String goodsType,
                                               BasicTextHttpResponseHandler handler) {
         if (!LoginAndInviteStatusUtil.acessNext(context, uid, true))
             return;
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("id", id);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("goodsType", goodsType);
         commonPostWithFailture(context, BASE_URL2 + "shraeStorage/accordtorage", params, handler);
     }
 
 
-    public static void sendGoodsOrder(Context context, String id, String uid, String goodsType,
+    public static void sendGoodsOrder(Context context, String id, Long uid, String goodsType,
                                       BasicTextHttpResponseHandler handler) {
         if (!LoginAndInviteStatusUtil.acessNext(context, uid, true))
             return;
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("goodsId", id);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("goodsType", goodsType);
         commonPostWithFailture(context, BASE_URL2 + "user/cloud/sendGoods", params, handler);
     }
@@ -3035,11 +3074,11 @@
      *
      * @param context id 鍟嗗搧ID
      */
-    public static void getGoodsDetailInfo(Context context, String id, String uid,
+    public static void getGoodsDetailInfo(Context context, String id, Long uid,
                                           BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("id", id);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL + "user/getnewgoodsdetail", params, handler);
     }
 
@@ -3048,25 +3087,99 @@
      *
      * @param context id 鍟嗗搧ID
      */
-    public static void getGoodsInfoTB(Context context, String id, String uid, String from,
+    public static void getGoodsInfoTB(Context context, String id, Long uid, String from,
                                       BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("id", id);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("from", from);
         commonPostWithFailture(context, BASE_URL2 + "goods/getDetailTB", params, handler);
     }
+
+
+    public static void getGoodsInfo(Context context, String goodsId, int goodsType, Long uid, String from,
+                                    BasicTextHttpResponseHandler handler) {
+        LinkedHashMap<String, String> params = new LinkedHashMap<>();
+        params.put("goodsId", goodsId);
+        params.put("goodsType", goodsType + "");
+        if (uid != null) params.put("uid", uid + "");
+        if (from != null)
+            params.put("from", from);
+        commonPostWithFailture(context, BuXinConstant.HOST + "/fanli/api/lijin/goods/getGoodsDetail", params, handler);
+    }
+
+
+    /**
+     * 閫氳繃娣樼ぜ閲戣喘涔�
+     *
+     * @param context
+     * @param goodsId
+     * @param goodsType
+     * @param lijinId
+     * @param uid
+     * @param from
+     * @param handler
+     */
+    public static void buyWithLijin(Context context, String goodsId, int goodsType, String lijinId, Long uid, String from,
+                                    BasicTextHttpResponseHandler handler) {
+        LinkedHashMap<String, String> params = new LinkedHashMap<>();
+        params.put("goodsId", goodsId);
+        params.put("goodsType", goodsType + "");
+        if (lijinId != null)
+            params.put("lijinId", lijinId);
+        if (uid != null) params.put("uid", uid + "");
+        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);
+    }
+
 
     /**
      * 娣樺疂鑾峰彇鍟嗗搧淇℃伅1.3.9
      *
      * @param context id 鍟嗗搧ID
      */
-    public static void getGoodsInfoJD(Context context, String id, String uid, String from,
+    public static void getGoodsInfoJD(Context context, String id, Long uid, String from,
                                       BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("id", id);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("from", from);
         commonPostWithFailture(context, BASE_URL2 + "goods/getDetailJD", params, handler);
     }
@@ -3081,11 +3194,11 @@
      * @param from
      * @param handler
      */
-    public static void getGoodsInfoVIP(Context context, String id, String uid, String from,
+    public static void getGoodsInfoVIP(Context context, String id, Long uid, String from,
                                        BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("id", id);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("from", from);
         commonPostWithFailture(context, BASE_URL2 + "goods/getDetailVIP", params, handler);
     }
@@ -3100,11 +3213,11 @@
      * @param from
      * @param handler
      */
-    public static void getGoodsInfoSuning(Context context, String id, String uid, String from,
+    public static void getGoodsInfoSuning(Context context, String id, Long uid, String from,
                                           BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("id", id);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("from", from);
         commonPostWithFailture(context, BASE_URL2 + "goods/getDetailSuning", params, handler);
     }
@@ -3115,11 +3228,11 @@
      *
      * @param context id 鍟嗗搧ID
      */
-    public static void getGoodsInfoPDD(Context context, String id, String uid, String from,
+    public static void getGoodsInfoPDD(Context context, String id, Long uid, String from,
                                        BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("id", id);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("from", from);
         commonPostWithFailture(context, BASE_URL2 + "goods/getDetailPDD", params, handler);
     }
@@ -3143,11 +3256,11 @@
      *
      * @param context id 鍟嗗搧ID
      */
-    public static void reportOrder(Context context, String order, String uid, String url, String money,
+    public static void reportOrder(Context context, String order, Long uid, String url, String money,
                                    BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
         params.put("order", order);
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("money", money);
         params.put("auctionUrl", url);
         commonPostWithFailture(context, BASE_URL + "user/reportorder", params, handler);
@@ -3159,10 +3272,10 @@
      *
      * @param context
      */
-    public static void getInviteInfo(Context context, String uid,
+    public static void getInviteInfo(Context context, Long uid,
                                      BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("pageIndex", "1");
         params.put("activityRules", "activityRules");
         commonPostWithFailture(context, BASE_URL + "invite/inviteGetMoney", params, handler);
@@ -3173,10 +3286,10 @@
      *
      * @param context
      */
-    public static void inviteFriend(Context context, String uid, int page,
+    public static void inviteFriend(Context context, Long uid, int page,
                                     BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page + "");
         commonPostWithFailture(context, BASE_URL2 + "invite/getInviteImgs", params, handler);
     }
@@ -3186,10 +3299,10 @@
      *
      * @param context
      */
-    public static void getUserItems(Context context, String uid,
+    public static void getUserItems(Context context, Long uid,
                                     BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "navbar/getUserItems", params, handler);
     }
 
@@ -3198,10 +3311,10 @@
      *
      * @param context
      */
-    public static void saveUserItems(Context context, String uid, String barIds,
+    public static void saveUserItems(Context context, Long uid, String barIds,
                                      BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("barIds", barIds);
         commonPostWithFailture(context, BASE_URL2 + "navbar/saveUserItems", params, handler);
     }
@@ -3211,10 +3324,10 @@
      *
      * @param context
      */
-    public static void resetDefault(Context context, String uid,
+    public static void resetDefault(Context context, Long uid,
                                     BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         commonPostWithFailture(context, BASE_URL2 + "navbar/restoreDefault", params, handler);
     }
 
@@ -3271,10 +3384,10 @@
      * @param uid
      */
     public static void getSystemParams(Context context,
-                                       String uid, BasicTextHttpResponseHandler handler) {
+                                       Long uid, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
         if (uid != null && !uid.equals("") && !uid.equals("null")) {
-            params.put("uid", uid);
+            if (uid != null) params.put("uid", uid + "");
         }
         boolean taobao = ToolUtil.uninstallSoftware(context, "com.taobao.taobao");
         boolean tmall = ToolUtil.uninstallSoftware(context, "com.tmall.wireless");
@@ -3296,10 +3409,10 @@
      * @param page
      * @param uid
      */
-    public static void getShareExplosions(Context context, String uid,
+    public static void getShareExplosions(Context context, Long uid,
                                           int page, BasicTextHttpResponseHandler handler) {
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
-        params.put("uid", uid);
+        if (uid != null) params.put("uid", uid + "");
         params.put("page", page + "");
         commonPostWithFailture(context, BASE_URL2 + "taolijin/getShareGoodsV2", params, handler);
     }
@@ -3340,6 +3453,36 @@
         params.put("goodsInfo", array.toString());
         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);
+    }
+
 
     /**
      * 鍥㈤槦璧勯噾缁熻
@@ -3463,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) {
@@ -3502,24 +3615,24 @@
 
         int version = PackageUtils2.getVersionCode(context);
         long time = System.currentTimeMillis();
-        String deviceType = MobileUtil.getSystemModel();
-        params.put("packages", "com.yeshi.ec.rebate");
+        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<>();
@@ -3552,23 +3665,23 @@
         // }
         int version = PackageUtils2.getVersionCode(context);
         long time = System.currentTimeMillis();
-        String deviceType = MobileUtil.getSystemModel();
-        params.put("packages", "com.yeshi.ec.rebate");
+        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();
@@ -3611,22 +3724,22 @@
         // }
         int version = PackageUtils2.getVersionCode(context);
         long time = System.currentTimeMillis();
-        String deviceType = MobileUtil.getSystemModel();
-        params.put("packages", "com.yeshi.ec.rebate");
+        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