From ddff7888bf7e754d12fb5fc85a58f3012f456490 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 六月 2021 17:26:03 +0800
Subject: [PATCH] 特价完善

---
 app/src/main/java/com/tejia/lijin/app/util/ToolUtil.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/tejia/lijin/app/util/ToolUtil.java b/app/src/main/java/com/tejia/lijin/app/util/ToolUtil.java
index 49e8d07..dac0a8e 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/ToolUtil.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/ToolUtil.java
@@ -20,9 +20,13 @@
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
+
 import androidx.annotation.NonNull;
+
 import com.google.android.material.appbar.AppBarLayout;
+
 import androidx.core.app.NotificationManagerCompat;
+
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.View;
@@ -47,6 +51,7 @@
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.nostra13.universalimageloader.core.assist.ImageScaleType;
 import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
+import com.tejia.lijin.app.ui.recommend.GoodsDetailActivity;
 import com.umeng.commonsdk.UMConfigure;
 import com.vivo.push.PushClient;
 import com.wpc.library.util.common.StringUtils;
@@ -67,7 +72,6 @@
 import com.tejia.lijin.app.ui.dialog.ShapeLoadingDialog;
 import com.tejia.lijin.app.ui.invite.ShareBrowserActivity;
 import com.tejia.lijin.app.ui.main.MainActivity;
-import com.tejia.lijin.app.ui.recommend.GoodsDetailActivityTB;
 import com.tejia.lijin.app.ui.recommend.SearchResultActivity;
 import com.tejia.lijin.app.ui.recommend.ShareGoodsImageActivity31;
 import com.tejia.lijin.app.util.umengCustomEvent.MainCustomEvent;
@@ -364,14 +368,17 @@
             } else {
                 try {
                     if (cClass.equals("com.tejia.lijin.app.ui.recommend.GoodsBrowserActivity")) {
-                        cClass = GoodsDetailActivityTB.class.getName();
+                        cClass = GoodsDetailActivity.class.getName();
                     }
                     Intent intent = new Intent(context, Class.forName(JumpActivityUtil.filterActivityName(cClass)));
                     if (!StringUtils.isEmpty(url1))
                         intent.putExtra("url", url1);
                     if (!StringUtils.isEmpty(id)) {
-                        intent.putExtra("id", id);
+                        intent.putExtra("goodsId", id);
+                        intent.putExtra("goodsType", Constant.GOODS_TYPE_TB);
                     }
+
+
                     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     context.startActivity(intent);
                 } catch (ClassNotFoundException e) {
@@ -387,13 +394,11 @@
      * 娉ㄥ唽 OPPO RegId
      */
     public static void registeredOPPOId(Context context) {
-        String uid = context.getSharedPreferences("user", Context.MODE_PRIVATE).getString("uid", "") + "";
-//        Log.e("eee", "registeredOPPOId-uid: " + uid);
         String registerId = null;
         if (PushManager.getInstance() != null)
             registerId = PushManager.getInstance().getRegisterID();
         if (!StringUtils.isEmpty(registerId))
-            ShoppingApi.bindOPPOPush(context, uid, registerId, new BasicTextHttpResponseHandler() {
+            ShoppingApi.bindOPPOPush(context, UserUtil.getUid(ShoppingApplication.application), registerId, new BasicTextHttpResponseHandler() {
                 @Override
                 public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
                     super.onSuccessPerfect(statusCode, headers, jsonObject);
@@ -405,13 +410,12 @@
      * 娉ㄥ唽 VIVO RegId
      */
     public static void registeredVIVORegId(Context context) {
-        String uid = context.getSharedPreferences("user", Context.MODE_PRIVATE).getString("uid", "") + "";
 //        Log.e("eee", "registeredVIVORegId-uid: " + uid);
         String registerId = null;
         if (PushClient.getInstance(context) != null)
             registerId = PushClient.getInstance(context).getRegId();
         if (!StringUtils.isEmpty(registerId))
-            ShoppingApi.bindVIVOPush(context, uid, registerId, new BasicTextHttpResponseHandler() {
+            ShoppingApi.bindVIVOPush(context, UserUtil.getUid(ShoppingApplication.application), registerId, new BasicTextHttpResponseHandler() {
                 @Override
                 public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
                     super.onSuccessPerfect(statusCode, headers, jsonObject);
@@ -811,8 +815,7 @@
     public static void createShareLink(final Context mContext, final GoodsDetail mInfo, String from) {
         final ShapeLoadingDialog pb = new ShapeLoadingDialog.Builder(mContext).build();
         pb.show();
-        String uid = mContext.getSharedPreferences("user", mContext.MODE_PRIVATE).getString("uid", "0");
-        ShoppingApi.createShareLink(mContext, uid, mInfo.getGoods().getGoodsId(), mInfo.getGoods().getGoodsType() + "", from, null, null, new BasicTextHttpResponseHandler() {
+        ShoppingApi.createShareLink(mContext, UserUtil.getUid(ShoppingApplication.application), mInfo.getGoods().getGoodsId(), mInfo.getGoods().getGoodsType() + "", from, null, null, new BasicTextHttpResponseHandler() {
             @Override
             public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
                 if (jsonObject.optString("code").equalsIgnoreCase("0")) {

--
Gitblit v1.8.0