From 41b23417cd62af3cd77b695a2b03446243431fc1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 14:11:54 +0800
Subject: [PATCH] '完善'
---
MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/GoodsDetailActivityJD.java | 62 +++++++++++++------------------
1 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/GoodsDetailActivityJD.java b/MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/GoodsDetailActivityJD.java
index 20020f5..a4c100e 100644
--- a/MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/GoodsDetailActivityJD.java
+++ b/MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/GoodsDetailActivityJD.java
@@ -710,7 +710,7 @@
View view = getLayoutInflater().inflate(R.layout.item_share_from_filter,
null, false);
// 鍒涘缓PopupWindow瀹炰緥,200,150鍒嗗埆鏄搴﹀拰楂樺害
- mTopRightPopupWindow = new PopupWindow(view, (int) (SystemCommon.getScreenWidth(this) / 2), ViewGroup.LayoutParams.WRAP_CONTENT, true);
+ mTopRightPopupWindow = new PopupWindow(view, (int) (SystemCommon.getScreenWidth(this) / 3), ViewGroup.LayoutParams.WRAP_CONTENT, true);
// 璁剧疆鍔ㄧ敾鏁堟灉 [R.style.AnimationFade 鏄嚜宸变簨鍏堝畾涔夊ソ鐨刔
// pw_filter.setAnimationStyle(R.style.pop_multiple);
mTopRightPopupWindow.setTouchable(true);
@@ -718,10 +718,10 @@
mTopRightPopupWindow.setFocusable(false);
ListView lv = view.findViewById(R.id.lv_filter_pw);
// mulList.add(new TopMenuRightPopContent( "澶嶅埗閾炬帴", R.drawable.ic_goods_detail_copy_link ));
- mulList.add(new TopMenuRightPopContent("甯姪涓績", R.drawable.ic_goods_detail_help_center));
- mulList.add(new TopMenuRightPopContent("鏂版墜鏀荤暐", R.drawable.ic_goods_detail_novice));
- mulList.add(new TopMenuRightPopContent("鑱旂郴瀹㈡湇", R.drawable.ic_goods_detail_contact_kefu));
- mulList.add(new TopMenuRightPopContent("鎴戣鍚愭Ы", R.drawable.ic_goods_detail_criticism));
+// mulList.add(new TopMenuRightPopContent("甯姪涓績", R.drawable.ic_goods_detail_help_center));
+// mulList.add(new TopMenuRightPopContent("鏂版墜鏀荤暐", R.drawable.ic_goods_detail_novice));
+ mulList.add(new TopMenuRightPopContent("鑱旂郴瀹㈡湇", null));
+ mulList.add(new TopMenuRightPopContent("鎴戣鍚愭Ы",null));
shareFromAdapter = new TopMenuRightPopContentAdapter(this, mulList);
lv.setAdapter(shareFromAdapter);
@@ -740,23 +740,9 @@
// } else
if (position == 0) {
- Intent intent1 = new Intent(GoodsDetailActivityJD.this, ShareBrowserActivity.class);
- intent1.putExtra("title", "甯姪涓績");
- intent1.putExtra("url", sp.getString("help", ""));
- startActivity(intent1);
- } else if (position == 1) {
- RecordImageTextVideo textVideo = new RecordImageTextVideo(GoodsDetailActivityJD.this);
- String url = textVideo.getvideoMoreUrl();
- if (StringUtils.isEmpty(url)) {
- url = textVideo.gettxtImgUtl();
- }
- Intent intent = new Intent(GoodsDetailActivityJD.this, ShareBrowserActivity.class);
- intent.putExtra("url", url);
- startActivity(intent);
- } else if (position == 2) {
// startActivity(new Intent(GoodsDetailActivityTB.this, ContactUsActivity.class));
KeFuUtil.jumpKeFu(GoodsDetailActivityJD.this, "鍟嗗搧璇︽儏");
- } else if (position == 3) {
+ } else if (position == 1) {
startActivity(new Intent(GoodsDetailActivityJD.this, GoComplainActivity.class));
}
}
@@ -903,6 +889,10 @@
h5Url = mInfo.getExtra().getH5Url();//浜у搧h5 閾炬帴
couponUsers = mInfo.getExtra().getListCouponUser();
sList = mInfo.getExtra().getListShareUser();
+ if (couponUsers != null)
+ couponUsers.clear();
+ if (sList != null)
+ sList.clear();
noRebateHelpLink = mInfo.getExtra().getShare().getHelpLink();
if (mInfo.getGoods().getLabels() != null && mInfo.getGoods().getLabels().size() > 0)
@@ -941,6 +931,7 @@
//璁剧疆鎺ㄨ崘淇℃伅
+ mInfo.getGoods().setDescription("");
if (StringUtils.isEmpty(mInfo.getGoods().getDescription())) {
ll_recommend.setVisibility(View.GONE);
} else {
@@ -1210,7 +1201,7 @@
} else if (isClick == 5) {
isClick = 0;
startActivity(new Intent(GoodsDetailActivityJD.this, Collect28Activity.class));
- } else if (isClick == 8) {//澶嶅埗娣樺彛浠�
+ } else if (isClick == 8) {//澶嶅埗娣樺彛浠�
commandCopy();
isClick = 0;
} else if (isClick == 9) {//璺宠浆濂栧姳鍒歌幏鍙�
@@ -1379,20 +1370,20 @@
startActivity(new Intent(Settings.ACTION_SETTINGS));
break;
//鏌ョ湅瀹濊礉璇︽儏
- case R.id.fl_goods_detail:
- if (mInfo == null || mInfo.getGoods() == null)
- return;
- if (isSpread) {
- webView.setVisibility(View.GONE);
-// ll_imgs.removeAllViews();
- iv_imgtext_status.setImageDrawable(getResources().getDrawable(R.drawable.ic_detail_img_close));
- } else {
- webView.setVisibility(View.VISIBLE);
- iv_imgtext_status.setImageDrawable(getResources().getDrawable(R.drawable.ic_detail_img_open));
-// getImgText();
- }
- isSpread = !isSpread;
- break;
+// case R.id.fl_goods_detail:
+// if (mInfo == null || mInfo.getGoods() == null)
+// return;
+// if (isSpread) {
+// webView.setVisibility(View.GONE);
+//// ll_imgs.removeAllViews();
+// iv_imgtext_status.setImageDrawable(getResources().getDrawable(R.drawable.ic_detail_img_close));
+// } else {
+// webView.setVisibility(View.VISIBLE);
+// iv_imgtext_status.setImageDrawable(getResources().getDrawable(R.drawable.ic_detail_img_open));
+//// getImgText();
+// }
+// isSpread = !isSpread;
+// break;
case R.id.tv_shop_see:
if (mInfo == null || mInfo.getGoods() == null)
return;
@@ -1700,7 +1691,6 @@
}
});
}
-
class ImageAdapter extends PagerAdapter {
--
Gitblit v1.8.0