From abce02c7a61820f5d580f87364d542e817be429c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 06 七月 2021 15:22:11 +0800
Subject: [PATCH] 1.1.1完善

---
 app/src/main/java/com/tejia/lijin/app/util/ui/ClipboardContentRecommendUtil.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/tejia/lijin/app/util/ui/ClipboardContentRecommendUtil.java b/app/src/main/java/com/tejia/lijin/app/util/ui/ClipboardContentRecommendUtil.java
index a26d4be..189c7a4 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/ui/ClipboardContentRecommendUtil.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/ui/ClipboardContentRecommendUtil.java
@@ -12,6 +12,8 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.tejia.lijin.app.ShoppingApplication;
+import com.tejia.lijin.app.ui.recommend.GoodsDetailActivity;
+import com.tejia.lijin.app.util.Constant;
 import com.tejia.lijin.app.util.user.UserUtil;
 import com.wpc.library.util.security.MD5Utils;
 import com.tejia.lijin.app.BasicTextHttpResponseHandler;
@@ -59,9 +61,10 @@
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 MainCustomEvent.rmdTbgoodsRecommendResultClick(activity, "鍟嗗搧");
-                Intent intent = GoodsDetailJumpUtil.getGoodsDetailIntent(activity, info.getGoods().getGoodsType());
+                Intent intent = new Intent(activity, GoodsDetailActivity.class);
+                intent.putExtra("goodsId", info.getGoods().getGoodsId());
+                intent.putExtra("goodsType", info.getGoods().getGoodsType());
                 intent.putExtra("title", info.getGoods().getTitle());
-                intent.putExtra("id", info.getGoods().getGoodsId());
                 intent.putExtra("from", "鐚滀綘鍠滄");
                 activity.startActivity(intent);
                 dialog.dismiss();
@@ -140,7 +143,7 @@
      *
      * @param title
      */
-    private static void isCopyTitle(final String title, final Activity context) {
+    private static void isCopyTitle(final String title, final Integer sourceType, final Activity context) {
         CopyTitleDialog.Builder builder = new CopyTitleDialog.Builder(context);
         builder.setMessage(title);
         builder.setPositiveButton("", new DialogInterface.OnClickListener() {
@@ -153,7 +156,7 @@
                 Intent intent = new Intent(context, SearchResultActivity.class);
                 intent.putExtra("content", title);
                 intent.putExtra("type", "normal");
-                intent.putExtra("page", (which - 1));
+                intent.putExtra("page", sourceType == null ? 0 : (sourceType - 1));
                 intent.putExtra("from", "recommendSearch");
                 context.startActivity(intent);
                 dialog.dismiss();
@@ -176,9 +179,9 @@
         final String key = "clipboardRecommend-" + MD5Utils.getMD532(description);
         if (!DuplicateEventFilterUtil.allowEvent(key, 2000))
             return;
-        if(dialog!=null&&dialog.isShowing())
+        if (dialog != null && dialog.isShowing())
             return;
-        ShoppingApi.getNewGoodsInfo(context, description,UserUtil.getUid(ShoppingApplication.application), new BasicTextHttpResponseHandler() {
+        ShoppingApi.getNewGoodsInfo(context, description, UserUtil.getUid(ShoppingApplication.application), new BasicTextHttpResponseHandler() {
             @Override
             public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
                 //闃叉閲嶅寮规
@@ -220,7 +223,7 @@
                         }
                         dialog = ToolUtil.isNotTBAlliance(new RecommendGoodsInfo(taoBaoGoodsBrief, leftJump, rightJump), type, context);
                     } else if (type.equalsIgnoreCase("2")) {// 鏅鸿兘鎼滅储寮圭獥
-                        isCopyTitle(data.optJSONObject("data").optString("title"), context);
+                        isCopyTitle(data.optJSONObject("data").optString("title"), data.optJSONObject("data").optInt("sourceType", Constant.GOODS_TYPE_TB), context);
                     } else if (type.equalsIgnoreCase("10") ||
                             type.equalsIgnoreCase("11") ||
                             type.equalsIgnoreCase("13")) {// 绫诲瀷锛�10 // 绫诲瀷锛�10-鍏嶅崟鍒�   11-濂栧姳鍒�   13-绾㈠寘
@@ -232,7 +235,7 @@
                     } else if (type.equalsIgnoreCase("20")) {
                         data = jsonObject.optJSONObject("data").optJSONObject("data");
                         ConvertLinkInfo convertLinkInfo = new Gson().fromJson(data.toString(), ConvertLinkInfo.class);
-                        dialog=  new ConvertLinkDialog.Builder(context).setConvertLinkInfo(convertLinkInfo).create();
+                        dialog = new ConvertLinkDialog.Builder(context).setConvertLinkInfo(convertLinkInfo).create();
                         dialog.show();
                     }
                 } else if (jsonObject.optInt("code") == 1001) {// 鐢ㄦ埛鏈櫥褰曟彁绀�

--
Gitblit v1.8.0