'完善'

admin

2020-07-14 41b23417cd62af3cd77b695a2b03446243431fc1

'完善'

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/entity/user/GDTAdInfo.java

New file
@@ -0,0 +1,22 @@
package com.yeshi.ec.rebate.myapplication.entity.user;

public class GDTAdInfo {
    private String appId;
    private String splashPid;

    public String getAppId() {
        return appId;
    }

    public void setAppId(String appId) {
        this.appId = appId;
    }

    public String getSplashPid() {
        return splashPid;
    }

    public void setSplashPid(String splashPid) {
        this.splashPid = splashPid;
    }
}

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/presenter/JdSpeciaFgPresenter.java

@@ -225,7 +225,7 @@
        if (mList.size() >= count) { //下拉数据请求完 到底了
            bottom.setVisibility(View.VISIBLE);
            iv_loading.setVisibility(View.GONE);
            tv_loading.setText("-到底了*^_^*-");
            tv_loading.setText(mContext.getResources().getString(R.string.list_no_more));
        } else {  //下拉还有数据时
            bottom.setVisibility(View.GONE);
        }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/presenter/PddSpeciaFgPresenter.java

@@ -223,7 +223,7 @@
        if (mList.size() >= count) { //下拉数据请求完 到底了
            bottom.setVisibility(View.VISIBLE);
            iv_loading.setVisibility(View.GONE);
            tv_loading.setText("-到底了*^_^*-");
            tv_loading.setText(mContext.getResources().getString(R.string.list_no_more));
        } else {  //下拉还有数据时
            bottom.setVisibility(View.GONE);
        }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/presenter/SelectionStoreHouse31Presenter.java

@@ -138,7 +138,7 @@
            if (wList.size() == count) {
                bottom.setVisibility(View.VISIBLE);
                iv_loading.setVisibility(View.GONE);
                tv_loading.setText("-到底了*^_^*-");
                tv_loading.setText(mContext.getResources().getString(R.string.list_no_more));
            }
            requestState(wList.size() == 0 ? 1 : 0, ll_delete
                    , ll_go_scan, ll_no_net, ll_request_failture, ll_content, tv_top_bar_right);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/presenter/SuningSpeciaFgPresenter.java

@@ -218,7 +218,7 @@
        if (mList.size() >= count) { //下拉数据请求完 到底了
            bottom.setVisibility(View.VISIBLE);
            iv_loading.setVisibility(View.GONE);
            tv_loading.setText("-到底了*^_^*-");
            tv_loading.setText(mContext.getResources().getString(R.string.list_no_more));
        } else {  //下拉还有数据时
            bottom.setVisibility(View.GONE);
        }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/presenter/TimeLimitedSpikePresenter.java

@@ -8,6 +8,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.yeshi.ec.rebate.myapplication.R;
import com.yeshi.ec.rebate.myapplication.contract.TimeLimitedSpikeContract;
import com.yeshi.ec.rebate.myapplication.entity.SpikTime;
import com.yeshi.ec.rebate.myapplication.entity.TaoBaoGoodsBrief;
@@ -114,7 +115,7 @@
            goodsListAdapter.notifyDataSetChanged();
            if (mContext.count == goodsBriefList.size()) {
                ivLoading.setVisibility(View.GONE);
                tvLoading.setText("到底了~");
                tvLoading.setText(mContext.getResources().getString(R.string.list_no_more));
            } else {
                ivLoading.setVisibility(View.GONE);
                tvLoading.setText("");

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/presenter/VipShopSpeciaFgPresenter.java

@@ -216,7 +216,7 @@
        if (mList.size() >= count) { //下拉数据请求完 到底了
            bottom.setVisibility(View.VISIBLE);
            iv_loading.setVisibility(View.GONE);
            tv_loading.setText("-到底了*^_^*-");
            tv_loading.setText(mContext.getResources().getString(R.string.list_no_more));
        } else {  //下拉还有数据时
            bottom.setVisibility(View.GONE);
        }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/BrandRebate/BrandFootprintInfoActivity.java

@@ -175,7 +175,7 @@
                    if (mlist.size() >= count && mlist.size() > 5) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    } else {
                        bottom.setVisibility(View.GONE);
                    }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/BrandRebate/BrandInfoActivity.java

@@ -46,6 +46,7 @@
import com.yeshi.ec.rebate.myapplication.util.GlideCircleTransform;
import com.yeshi.ec.rebate.myapplication.util.ToolUtil;
import com.yeshi.ec.rebate.myapplication.util.TopStatusSettings;
import com.yeshi.ec.rebate.myapplication.util.ui.ColorUtil;
import com.yeshi.ec.rebate.myapplication.util.umengCustomEvent.BrandRebateEvent;

import org.apache.http.Header;
@@ -319,7 +320,7 @@
                            setTopimg(BrandInfoActivity.this, mshop.optString("shopIcon"), braninfo_top_img);
                            String show[] = showImageFace(mshop.optInt("userType"));
                            setShape(4, show[0], show[0], show[1], braninfo_top_userType);
                            setShape(100, "#E5005C", "#E5005C", "进店", braninfo_top_store);
                            setShape(100,ColorUtil.getHexString(getResources().getColor(R.color.theme)),  ColorUtil.getHexString(getResources().getColor(R.color.theme)), "进店", braninfo_top_store);
                            shopLink = mshop.getString("shopLink");
                        }
                        if (shop.length() >= 2) {//店铺二
@@ -329,7 +330,7 @@
                            setTopimg(BrandInfoActivity.this, mshop.optString("shopIcon"), braninfo_top_img2);
                            String show[] = showImageFace(mshop.optInt("userType"));
                            setShape(4, show[0], show[0], show[1], braninfo_top_userType2);
                            setShape(100, "#E5005C", "#E5005C", "进店", braninfo_top_store2);
                            setShape(100, ColorUtil.getHexString(getResources().getColor(R.color.theme)), ColorUtil.getHexString(getResources().getColor(R.color.theme)), "进店", braninfo_top_store2);
                            shopLink2 = mshop.getString("shopLink");
                        }
                        if (shop.length() == 3) {//店铺三
@@ -339,7 +340,7 @@
                            setTopimg(BrandInfoActivity.this, mshop.optString("shopIcon"), braninfo_top_img3);
                            String show[] = showImageFace(mshop.optInt("userType"));
                            setShape(4, show[0], show[0], show[1], braninfo_top_userType3);
                            setShape(100, "#E5005C", "#E5005C", "进店", braninfo_top_store3);
                            setShape(100, ColorUtil.getHexString(getResources().getColor(R.color.theme)), ColorUtil.getHexString(getResources().getColor(R.color.theme)), "进店", braninfo_top_store3);
                            shopLink3 = mshop.getString("shopLink");
                        }
                    } else {
@@ -365,7 +366,7 @@
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        ll_go_scan.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    } else {
                        if (jsonObject.optJSONObject("data").optJSONArray("picList").toString().equals("[]") &&
                                jsonObject.optJSONObject("data").optJSONArray("shopList").toString().equals("[]") &&

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/BrandRebate/BrandShoplistAdapter.java

@@ -11,6 +11,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;

import com.bumptech.glide.Glide;
@@ -411,19 +412,19 @@
        private TextView item_brandshoplis_more;//更多 跳转到店铺详情

        private ImageView item_brandshoplis_img;//商品1 圖片
        private LinearLayoutCompat item_brandshoplis_couponLy1;//券整体布局
        private LinearLayout item_brandshoplis_couponLy1;//券整体布局
        private TextView item_brandshoplis_coupon1;//优惠券1
        private TextView item_brandshoplis_price1;//商品原價1
        private TextView item_brandshoplis_rebate1;//商品返利1

        private ImageView item_brandshoplis_img2;//商品图片2
        private LinearLayoutCompat item_brandshoplis_couponLy2;//券整体布局
        private LinearLayout item_brandshoplis_couponLy2;//券整体布局
        private TextView item_brandshoplis_coupon2;//優惠券2
        private TextView item_brandshoplis_price2;//商品原价2
        private TextView item_brandshoplis_rebate2;//商品返利2

        private ImageView item_brandshoplis_img3;//商品图片2
        private LinearLayoutCompat item_brandshoplis_couponLy3;//券整体布局
        private LinearLayout item_brandshoplis_couponLy3;//券整体布局
        private TextView item_brandshoplis_coupon3;//優惠券2
        private TextView item_brandshoplis_price3;//商品原价2
        private TextView item_brandshoplis_rebate3;//商品返利2

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/BrandRebate/FragmentBrandFragment2.java

@@ -286,7 +286,7 @@
                            if (mList.size() >= count) { //下拉数据请求完 到底了
                                bottom.setVisibility(View.VISIBLE);
                                iv_loading.setVisibility(View.GONE);
                                tv_loading.setText("-到底了*^_^*-");
                                tv_loading.setText(getResources().getString(R.string.list_no_more));
                            } else {  //下拉还有数据时
                                if (bottom.getVisibility() == View.VISIBLE) {
                                    bottom.setVisibility(View.GONE);
@@ -445,7 +445,7 @@
                    if (mList.size() >= count) { //下拉数据请求完 到底了
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    } else {  //下拉还有数据时
                        bottom.setVisibility(View.GONE);
                    }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/SplashActivity.java

@@ -31,11 +31,13 @@
import com.alibaba.baichuan.android.trade.AlibcTradeSDK;
import com.alibaba.baichuan.android.trade.callback.AlibcTradeInitCallback;
import com.alibaba.baichuan.trade.biz.core.taoke.AlibcTaokeParams;
import com.google.gson.Gson;
import com.huawei.android.hms.agent.HMSAgent;
import com.huawei.android.hms.agent.common.handler.ConnectHandler;
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
import com.qq.e.ads.splash.SplashAD;
import com.qq.e.ads.splash.SplashADListener;
import com.qq.e.comm.managers.GDTADManager;
import com.qq.e.comm.util.AdError;
import com.umeng.analytics.MobclickAgent;
import com.wpc.library.okhttp.OkHttpUtils;
@@ -47,8 +49,10 @@
import com.yeshi.ec.rebate.myapplication.BuXinConstant;
import com.yeshi.ec.rebate.myapplication.R;
import com.yeshi.ec.rebate.myapplication.ShoppingApi;
import com.yeshi.ec.rebate.myapplication.entity.user.GDTAdInfo;
import com.yeshi.ec.rebate.myapplication.ui.guidepages.GuidePages;
import com.yeshi.ec.rebate.myapplication.ui.main.MainActivity;
import com.yeshi.ec.rebate.myapplication.util.AdUtil;
import com.yeshi.ec.rebate.myapplication.util.Constant;
import com.yeshi.ec.rebate.myapplication.util.PermissionsActivity;
import com.yeshi.ec.rebate.myapplication.util.PermissionsChecker;
@@ -194,12 +198,16 @@
    }

    private void loadAD() {
        GDTAdInfo adInfo = AdUtil.getGDTADInfo(getApplicationContext());
        if (adInfo == null) {
            return;
        }

        if (Build.VERSION.SDK_INT >= 23) {
            checkAndRequestPermission();
            checkAndRequestPermission(adInfo.getSplashPid());
        } else {
            // 如果是Android6.0以下的机器，默认在安装时获得了所有权限，可以直接调用SDK
            fetchSplashAD(this, container, skipView, getPosId(), this, 0);
            fetchSplashAD(this, container, skipView, adInfo.getSplashPid(), this, 0);
        }
    }

@@ -213,11 +221,6 @@
    }


    private String getPosId() {
        String posId = getIntent().getStringExtra("pos_id");
        return TextUtils.isEmpty(posId) ? "6071718323622945" : posId;
    }

    /**
     * ----------非常重要----------
     * <p>
@@ -229,7 +232,7 @@
     * 注意：下面的`checkSelfPermission`和`requestPermissions`方法都是在Android6.0的SDK中增加的API，如果您的App还没有适配到Android6.0以上，则不需要调用这些方法，直接调用广点通SDK即可。
     */
    @TargetApi(Build.VERSION_CODES.M)
    private void checkAndRequestPermission() {
    private void checkAndRequestPermission(String pid) {
        List<String> lackedPermission = new ArrayList<String>();
        if (!(checkSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED)) {
            lackedPermission.add(Manifest.permission.READ_PHONE_STATE);
@@ -245,7 +248,7 @@

        // 权限都已经有了，那么直接调用SDK
        if (lackedPermission.size() == 0) {
            fetchSplashAD(this, container, skipView, getPosId(), this, 0);
            fetchSplashAD(this, container, skipView, pid, this, 0);
        } else {
            // 请求所缺少的权限，在onRequestPermissionsResult中再看是否获得权限，如果获得权限就可以调用SDK，否则不要调用SDK。
            String[] requestPermissions = new String[lackedPermission.size()];
@@ -267,7 +270,10 @@
    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
        if (requestCode == 1024 && hasAllPermissionsGranted(grantResults)) {
            fetchSplashAD(this, container, skipView, getPosId(), this, 0);
            GDTAdInfo adInfo = AdUtil.getGDTADInfo(getApplicationContext());
            if(adInfo==null)
                return;
            fetchSplashAD(this, container, skipView, adInfo.getSplashPid(), this, 0);
        } else {
            // 如果用户没有授权，那么应该说明意图，引导用户去设置里面授权。
            Toast.makeText(this, "应用缺少必要的权限！请点击\"权限\"，打开所需要的权限。", Toast.LENGTH_LONG).show();
@@ -371,7 +377,7 @@
                }
            }, 2000);
        } else {//不需要显示引导页
            loadAD();

            //请求广告是否需要显示
            ShoppingApi.getSplashAdConfig(getApplicationContext(), new BasicTextHttpResponseHandler() {
                @Override
@@ -380,12 +386,27 @@
                    if (jsonObject.optInt("code") == 0) {
                        JSONObject data = jsonObject.optJSONObject("data");
                        if (data.optBoolean("show")) {//显示广告
                            iv_splash.postDelayed(new Runnable() {
                                @Override
                                public void run() {
                                    showAd();
                                }
                            }, 2000);
                            JSONObject ad = data.optJSONObject("ad");
                            GDTAdInfo info = new Gson().fromJson(ad.toString(), GDTAdInfo.class);
                            if (info != null) {
                                AdUtil.saveGDTADInfo(getApplicationContext(), info);
                                GDTADManager.getInstance().initWith(SplashActivity.this, info.getAppId());
                                loadAD();
                                iv_splash.postDelayed(new Runnable() {
                                    @Override
                                    public void run() {
                                        showAd();
                                    }
                                }, 2000);
                            } else {
                                //延时2s跳转
                                iv_splash.postDelayed(new Runnable() {
                                    @Override
                                    public void run() {
                                        jumpMainActivity();
                                    }
                                }, 2000);
                            }
                        } else {//不显示
                            //延时2s跳转
                            iv_splash.postDelayed(new Runnable() {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/category/CategoryActivity.java

@@ -342,7 +342,7 @@
                                if (wList.size() == count) {
                                    bottom.setVisibility(View.VISIBLE);
                                    iv_loading.setVisibility(View.GONE);
                                    tv_loading.setText("-到底了*^_^*-");
                                    tv_loading.setText(getResources().getString(R.string.list_no_more));
                                }
                                requestState(wList.size() == 0 ? 1 : 0);
                            } else {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/category/CategoryMinAdapter.java

@@ -73,7 +73,7 @@
                mTextView.setText(detailBean.getTag());
                mDivider.setVisibility(detailBean.getPos() == 0 ? View.GONE : View.VISIBLE);
            } else if (type == BaseRecyclerAdapter.ITEM_VIEW_TYPE_FOOTER) {
                mTextView.setText("-到底了*^_^*-");
                mTextView.setText(mContext.getResources().getString(R.string.list_no_more));
            } else {
                mTextView.setText(detailBean.getName());
                Glide.with(mContext)

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/category/ShareFromAdapter.java

@@ -46,10 +46,6 @@
        view = LayoutInflater.from(mContext).inflate(R.layout.item_share_from, null);
        TextView tv_content = view.findViewById(R.id.tv_content);
        tv_content.setText(mList.get(position));
        tv_content.setCompoundDrawablesWithIntrinsicBounds(position == 0 ? R.drawable.ic_share_from_all
                : position == 1 ? R.drawable.ic_share_from_trend : position == 2
                ? R.drawable.ic_share_from_selection : R.drawable.ic_share_from_goodsdetail, 0, 0, 0);

        return view;
    }
}

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/dialog/CopyLinkDialog.java

@@ -131,7 +131,7 @@

            GradientDrawable gradientDrawable = new GradientDrawable();
            gradientDrawable.setCornerRadius(DimenUtils.dip2px(context, 40));
            gradientDrawable.setStroke(DimenUtils.dip2px(context, 1), context.getResources().getColor(R.color.main_text_color));
            gradientDrawable.setStroke(DimenUtils.dip2px(context, 1), context.getResources().getColor(R.color.theme));
            gradientDrawable.setColor(context.getResources().getColor(R.color.white));
            tv_left.setBackgroundDrawable(gradientDrawable);
            tv_left.setVisibility(View.GONE);
@@ -309,7 +309,7 @@
            GradientDrawable shape = new GradientDrawable();
            shape.setCornerRadius(ScreenUtils.dp2px(context, 100));
            //设置颜色
            shape.setColor(Color.parseColor("#FF217A"));
            shape.setColor(context.getResources().getColor(R.color.theme));
            //设置大小
            tv_go.setBackground(shape);


 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/gmtemplate/GmTemplateFragment.java

@@ -293,7 +293,7 @@
                            if (mList.size() == count) {
                                bottom.setVisibility(View.VISIBLE);
                                iv_loading.setVisibility(View.GONE);
                                tv_loading.setText("-到底了*^_^*-");
                                tv_loading.setText(getResources().getString(R.string.list_no_more));
                            }
                            requestState(mList.size() == 0 ? 1 : 0);
                            getCateGorySecond(jsonObject);//获取banner数据

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/invite/ShareBrowserActivity.java

@@ -788,7 +788,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);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/main/MainActivity.java

@@ -491,6 +491,7 @@
                    } else {
                        totalCount = 0;
                    }
                    totalCount = 0;
                } else {
                    totalCount = 0;
                    tv_msg_num2.setVisibility(View.INVISIBLE);//隐藏我的红点
@@ -505,7 +506,7 @@
     * 设置 未读消息数量
     */
    public void setUnReadMsgCount(JSONObject jsonObject) {
        this.totalCount = jsonObject.optJSONObject("data").optInt("totalCount");
        this.totalCount = 0;//jsonObject.optJSONObject("data").optInt("totalCount");
        showreddot();

//                Log.e("eee", "Main 消息 未读数量: " + totalCount);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/main/MessageFragment.java

@@ -475,7 +475,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
//                    requestState(mList.size() == 0 ? 1 : 0);
                } else {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/main/MineFragment.java

@@ -140,7 +140,7 @@
    private TextView tv_reward_today, tv_reward_yestoday, tv_reward_current_month, tv_reward_last_month;
    private TextView tv_share_estimate_reward, tv_fanli_reward;

    private LinearLayout ll_count, ll_share_and_selection;
    private LinearLayout ll_count;
    private RelativeLayout ll_title_face;
    private LinearLayout ll_title;
    private ScListerScrollView sv_mine;
@@ -238,7 +238,6 @@
        tv_mine_login = contentView.findViewById(R.id.tv_mine_login);

        ll_count = contentView.findViewById(R.id.ll_count);
        ll_share_and_selection = contentView.findViewById(R.id.ll_share_and_selection);
        tv_balance = contentView.findViewById(R.id.tv_balance);
        ll_title_face = contentView.findViewById(R.id.ll_title_face);
        ll_title = contentView.findViewById(R.id.ll_title);
@@ -472,13 +471,12 @@
    }

    private void noLogin() {
        ll_share_and_selection.setVisibility(View.GONE);
        tv_user_numlayout.setVisibility(View.GONE);
        tv_user_num.setVisibility(View.GONE);
        ll_nick_name_vip.setVisibility(View.GONE);
        tv_nickName.setVisibility(View.GONE);
        tv_mine_login.setVisibility(View.VISIBLE);
        tv_mine_login.setText("登录领返利");
        tv_mine_login.setText("登录");
        tv_user_num.setText("");
//        tv_mine_invite.setText("邀请激活");
        String balance = "¥ 0.00";
@@ -888,9 +886,6 @@


                    ll_count.setVisibility(View.VISIBLE);

                    ll_share_and_selection.setVisibility(moduleState.optInt("noShareRecordAndStorage")
                            == 0 ? View.VISIBLE : View.GONE);


                    redPackLock = data.optInt("redPackLock");// 红包功能关闭开启

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/message/SystemMessageActivity.java

@@ -191,7 +191,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }

                    requestState(mList.size() == 0 ? 1 : 0);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/message/UserMessageActivity.java

@@ -251,7 +251,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    requestState(mList.size() == 0 ? 1 : 0);
                } else {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/AccountDescActivity33.java

@@ -110,16 +110,16 @@
        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);
        mTopRightPopupWindow.setOutsideTouchable(false);
        mTopRightPopupWindow.setFocusable(false);
        ListView lv = view.findViewById(R.id.lv_filter_pw);
        mulList.add(new TopMenuRightPopContent("查看全部", R.drawable.ic_gold_desc_all));
        mulList.add(new TopMenuRightPopContent("只看收入", R.drawable.icon_menu_shouru));
        mulList.add(new TopMenuRightPopContent("只看支出", R.drawable.icon_menu_zhichu));
        mulList.add(new TopMenuRightPopContent("查看全部", null));
        mulList.add(new TopMenuRightPopContent("只看收入", null));
        mulList.add(new TopMenuRightPopContent("只看支出",null));

        shareFromAdapter = new TopMenuRightPopContentAdapter(this, mulList);
        lv.setAdapter(shareFromAdapter);
@@ -395,7 +395,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    } else {
                        bottom.setVisibility(View.GONE);
                    }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/Collect28Activity.java

@@ -355,7 +355,7 @@
                    if (wList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }

                    requestState(wList.size() == 0 ? 1 : 0);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/CreateRecordingActivity.java

@@ -134,7 +134,7 @@
                    if (wList.size() == count && page != 1) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    requestState(wList.size() == 0 ? 1 : 0);
                } else {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/GoldDescActivity.java

@@ -334,7 +334,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    } else {
                        bottom.setVisibility(View.GONE);
                    }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/HongBaoSendRecordActivity.java

@@ -189,7 +189,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }

                    requestState(mList.size() == 0 ? 1 : 0);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/MyFootmarkActivity.java

@@ -348,7 +348,7 @@
                    if (wList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    requestState(wList.size() == 0 ? 1 : 0);
                } else {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/MyMoneyHistoryDetailActivity.java

@@ -239,7 +239,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    requestState(mList.size() == 0 ? 1 : 0);
                } else {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/MyPlayerListActivity.java

@@ -347,7 +347,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                }
            }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/MyPlayerSearchResultActivity.java

@@ -288,7 +288,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                }
            }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/OrderActivity33.java

@@ -120,9 +120,7 @@
    String helpUrl;
    String findOrderHelpUrl;//订单找回帮助链接
    boolean isLoad = false;
    //显示没有统计订单按钮
    private FrameLayout ll_orderfl;
    private TextView ll_orderhelp;


    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -194,10 +192,6 @@

        srl_rebate_order.setColorSchemeColors(getResources().getColor(R.color.theme));
        findViewById(R.id.fl_order_category).setVisibility(View.VISIBLE);

        ll_orderfl = findViewById(R.id.ll_orderfl);
        ll_orderhelp = findViewById(R.id.ll_orderhelp);
        ToolUtil.setShape_bg(ll_orderfl.getContext(), 12, "#ffe5005c", ll_orderhelp);
    }


@@ -218,7 +212,6 @@
        iv_open_taobao_order.setOnClickListener(this);
        iv_three_red_point.setOnClickListener(this);
        v_cover.setOnClickListener(this);
        ll_orderhelp.setOnClickListener(this);

        tv_go_scan.setOnClickListener(this);
        mChangeHelper = new ConnectivityChangeHelper(this,
@@ -483,15 +476,12 @@
                    helpUrl = jsonObject.optJSONObject("data").optString("helpUrl");
                    findOrderHelpUrl = jsonObject.optJSONObject("data").optString("findOrderHelpUrl");///订单找回帮助链接
                    requestState(mList.size() == 0 ? 1 : 0);
                    if (ll_orderfl.getVisibility() == View.GONE && StringUtils.isEmpty(findOrderHelpUrl))
                        ll_orderfl.setVisibility(View.GONE);
                    else
                        ll_orderfl.setVisibility(View.VISIBLE);


                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    Log.i("mResult", jsonObject.toString());
                } else {
@@ -816,11 +806,6 @@
                break;
            case R.id.ll_slid_to_top:
                mFilterPopupWindow.dismiss();
                break;
            case R.id.ll_orderhelp://订单没有被统计
                Intent intent2 = new Intent(OrderActivity33.this, ShareBrowserActivity.class);
                intent2.putExtra("url", findOrderHelpUrl);
                startActivity(intent2);
                break;
            default:
                break;

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/OrderAppealHistoryActivity.java

@@ -202,7 +202,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    if (count == 0) {
                        tv_right.setVisibility(View.INVISIBLE);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/OrderMultipleAdapter.java

@@ -52,7 +52,7 @@

        if (position == selectItem) {
            iv_selected.setVisibility(View.VISIBLE);
            tv_content.setTextColor(mContext.getResources().getColor(R.color.main_text_color));
            tv_content.setTextColor(mContext.getResources().getColor(R.color.theme));
        } else {
            iv_selected.setVisibility(View.INVISIBLE);
            tv_content.setTextColor(mContext.getResources().getColor(R.color.gray2));

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/OrderSearchResultActivity.java

@@ -239,7 +239,7 @@
                            if (mList.size() == count) {
                                bottom.setVisibility(View.VISIBLE);
                                iv_loading.setVisibility(View.GONE);
                                tv_loading.setText("-到底了*^_^*-");
                                tv_loading.setText(getResources().getString(R.string.list_no_more));
                            }
                            requestState(mList.size() == 0 ? 1 : 0);
                        } else {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/PlayerRemarkTeamListFragment.java

@@ -205,7 +205,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    adapter.notifyDataSetChanged();
                    requestState(mList.size() == 0 ? 1 : 0);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/PromotionDetailActivity.java

@@ -284,7 +284,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    } else {
                        bottom.setVisibility(View.GONE);
                    }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/PushRecommendHistoryActivity.java

@@ -204,7 +204,7 @@
                    if (count > 0 && mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    } else if (count == 0) {
                        bottom.setVisibility(View.GONE);
                    }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/RewardStatisticsOrderActivity33.java

@@ -258,7 +258,7 @@
                                if (mList.size() == count) {
                                    bottom.setVisibility(View.VISIBLE);
                                    iv_loading.setVisibility(View.GONE);
                                    tv_loading.setText("-到底了*^_^*-");
                                    tv_loading.setText(getResources().getString(R.string.list_no_more));
                                }
                                requestState(mList.size() == 0 ? 1 : 0);
                            } else {
@@ -333,15 +333,15 @@
     * 筛选类型变化
     */
    private void filterTypeChange() {
        tv_valid_order_money.setTextColor(orderState == 1 ? getResources().getColor(R.color.main_text_color)
        tv_valid_order_money.setTextColor(orderState == 1 ? getResources().getColor(R.color.theme)
                : getResources().getColor(R.color.black));
        tv_valid_order_hint.setTextColor(orderState == 1 ? getResources().getColor(R.color.main_text_color)
        tv_valid_order_hint.setTextColor(orderState == 1 ? getResources().getColor(R.color.theme)
                : getResources().getColor(R.color.black));
        v_valid.setVisibility(orderState == 1 ? View.VISIBLE : View.INVISIBLE);

        tv_weiquan_order_money.setTextColor(orderState == 2 ? getResources().getColor(R.color.main_text_color)
        tv_weiquan_order_money.setTextColor(orderState == 2 ? getResources().getColor(R.color.theme)
                : getResources().getColor(R.color.black));
        tv_weiquan_order_hint.setTextColor(orderState == 2 ? getResources().getColor(R.color.main_text_color)
        tv_weiquan_order_hint.setTextColor(orderState == 2 ? getResources().getColor(R.color.theme)
                : getResources().getColor(R.color.black));
        v_weiquan.setVisibility(orderState == 2 ? View.VISIBLE : View.INVISIBLE);
    }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/ShareGoodsActivity31.java

@@ -334,7 +334,7 @@
                    if (wList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }

                    requestState(wList.size() == 0 ? 1 : 0);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/ShareHistoryActivity31.java

@@ -282,7 +282,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }

                    requestState(mList.size() == 0 ? 1 : 0);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/WebTopRightAdapter.java

@@ -50,17 +50,17 @@
        ImageView iv_img_left = view.findViewById(R.id.iv_img_left);
        TextView tv_content = view.findViewById(R.id.tv_content);
        tv_content.setText(mList.get(position).getName());
        if (position >= mList.size() - 2) {
            iv_img_left.setImageDrawable(mContext.getResources().getDrawable(position == mList.size() - 1 ?
                    R.drawable.ic_web_kefu : R.drawable.ic_web_refresh));
        } else {
            if (StringUtils.isEmpty(mList.get(position).getIcon())) {
                iv_img_left.setImageResource(mList.get(position).getIcon1());
            } else {
                Glide.with(mContext.getApplicationContext()).load(mList.get(position).getIcon()).into(iv_img_left);
            }

        }
//        if (position >= mList.size() - 2) {
//           iv_img_left.setImageDrawable(mContext.getResources().getDrawable(position == mList.size() - 1 ?
//                   R.drawable.ic_web_kefu : R.drawable.ic_web_refresh));
//        } else {
//            if (StringUtils.isEmpty(mList.get(position).getIcon())) {
//                iv_img_left.setImageResource(mList.get(position).getIcon1());
//            } else {
//                Glide.with(mContext.getApplicationContext()).load(mList.get(position).getIcon()).into(iv_img_left);
//            }
//
//        }


        return view;

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/WelfareCenterActivity.java

@@ -199,7 +199,7 @@
                    if (mList.size() > 0 && mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    ll_no_ticket.setVisibility(mList.size() == 0 ? View.VISIBLE : View.GONE);
                    fl_content.setBackgroundColor(getResources().getColor(R.color.register_gray));

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/WithdrawRecordActivity.java

@@ -227,7 +227,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    requestState(mList.size() == 0 ? 1 : 0);
                } else {

 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 {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/GoodsDetailActivityPDD.java

@@ -115,11 +115,11 @@
public class GoodsDetailActivityPDD extends BaseFragmentActivity implements View.OnClickListener {
    private ImageView iv_top_left, iv_back, iv_shop_img,
            iv_notif_portrait, iv_imgtext_status, iv_share, iv_top_right,
             iv_loading, iv_vip;
            iv_loading, iv_vip;
    private TextView tv_top_title1, tv_top_title2, tv_top_title3, tv_top_title4, tv_shop_name,
            tv_shop_des, tv_shop_service, tv_shop_logistics, tv_shop_des_grade,
            tv_shop_logistics_grade, tv_shop_service_grade, tv_notif_name,
            tv_notif_des, tv_shop_see ;
            tv_notif_des, tv_shop_see;
    private FrameLayout fl_back_face, fl_content;
    private LinearLayout ll_goods_detail_transition_top, ll_shop,
            ll_guess_like, ll_labels, ll_address;
@@ -183,7 +183,6 @@
    //推荐语
    private LinearLayout ll_recommend;
    private TextView tv_recommend;



    private void setBottom(GoodsDetail mInfo) {
@@ -371,9 +370,6 @@
        tv_shop_logistics_grade = findViewById(R.id.tv_shop_logistics_grade);
        tv_shop_service_grade = findViewById(R.id.tv_shop_service_grade);
        iv_vip = findViewById(R.id.iv_vip);





        v_cover = findViewById(R.id.v_cover);
@@ -703,18 +699,18 @@
        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);
        mTopRightPopupWindow.setOutsideTouchable(false);
        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_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("联系客服",null));
        mulList.add(new TopMenuRightPopContent("我要吐槽", null));
        shareFromAdapter = new TopMenuRightPopContentAdapter(this, mulList);
        lv.setAdapter(shareFromAdapter);

@@ -726,26 +722,9 @@
                GoodsCustomEvent.goodsDetailMoreBtn(GoodsDetailActivityPDD.this, mulList.get(position).getName());
                SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
                if (position == 0) {
                    ClipboardUtil.copy(getApplicationContext(), h5Url);
                    Toast.makeText(GoodsDetailActivityPDD.this, "链接复制成功", Toast.LENGTH_LONG).show();
                } else if (position == 1) {
                    Intent intent1 = new Intent(GoodsDetailActivityPDD.this, ShareBrowserActivity.class);
                    intent1.putExtra("title", "帮助中心");
                    intent1.putExtra("url", sp.getString("help", ""));
                    startActivity(intent1);
                } else if (position == 2) {
                    RecordImageTextVideo textVideo = new RecordImageTextVideo(GoodsDetailActivityPDD.this);
                    String url = textVideo.getvideoMoreUrl();
                    if (StringUtils.isEmpty(url)) {
                        url = textVideo.gettxtImgUtl();
                    }
                    Intent intent = new Intent(GoodsDetailActivityPDD.this, ShareBrowserActivity.class);
                    intent.putExtra("url", url);
                    startActivity(intent);
                } else if (position == 3) {
//                    startActivity(new Intent(GoodsDetailActivityTB.this, ContactUsActivity.class));
                    KeFuUtil.jumpKeFu(GoodsDetailActivityPDD.this, "商品详情");
                } else if (position == 4) {
                } else if (position == 1) {
                    startActivity(new Intent(GoodsDetailActivityPDD.this, GoComplainActivity.class));
                }
            }
@@ -891,6 +870,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)
@@ -925,6 +908,7 @@
                    tv_rebate_num.setText(" 返" + mInfo.getGoods().getMoneyInfo().getFanliMoney());

                    //设置推荐信息
                    mInfo.getGoods().setDescription("");
                    if (StringUtils.isEmpty(mInfo.getGoods().getDescription())) {
                        ll_recommend.setVisibility(View.GONE);
                    } else {
@@ -953,7 +937,6 @@
                    } else {
                        ll_shop.setVisibility(View.GONE);
                    }



                    if (mInfo.getGoods().isHasCoupon()) {
@@ -1110,7 +1093,7 @@
                    isClick = 0;
                }

            }  else if (isClick == 4) {
            } else if (isClick == 4) {
                if (AlibcLogin.getInstance().isLogin()) {
                    isClick = 0;
                    startActivity(new Intent(GoodsDetailActivityPDD.this, ShoppingTrolleyActivity.class));
@@ -1168,7 +1151,7 @@
            createShareLink();
        } else {
            isClick = 2;
            Toast.makeText(GoodsDetailActivityPDD.this, String.format("请先登录%s账号",getResources().getString(R.string.app_name)), Toast.LENGTH_LONG).show();
            Toast.makeText(GoodsDetailActivityPDD.this, String.format("请先登录%s账号", getResources().getString(R.string.app_name)), Toast.LENGTH_LONG).show();
            UserUtil.jumpLogin(GoodsDetailActivityPDD.this);
        }
    }
@@ -1255,7 +1238,7 @@
                GoodsCustomEvent.goodsDetailBuyCommon(this);
                if (!isLogin) {
                    isClick = 1;
                    Toast.makeText(GoodsDetailActivityPDD.this,String.format("请先登录%s账号",getResources().getString(R.string.app_name)), Toast.LENGTH_LONG).show();
                    Toast.makeText(GoodsDetailActivityPDD.this, String.format("请先登录%s账号", getResources().getString(R.string.app_name)), Toast.LENGTH_LONG).show();
                    UserUtil.jumpLogin(GoodsDetailActivityPDD.this);
                } else {
                    getPDDLinkInfo();
@@ -1272,20 +1255,20 @@
                getGoodsRecommend();
                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;
@@ -1314,7 +1297,6 @@
                intent.putExtra("content", mInfo.getGoods().getTitle());
                startActivity(intent);
                break;



            case R.id.tv_big_btn:
@@ -1535,7 +1517,6 @@
            }
        });
    }



    class ImageAdapter extends PagerAdapter {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/GoodsDetailActivitySuning.java

@@ -705,7 +705,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);
@@ -713,10 +713,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);

@@ -735,23 +735,9 @@
//                } else

                if (position == 0) {
                    Intent intent1 = new Intent(GoodsDetailActivitySuning.this, ShareBrowserActivity.class);
                    intent1.putExtra("title", "帮助中心");
                    intent1.putExtra("url", sp.getString("help", ""));
                    startActivity(intent1);
                } else if (position == 1) {
                    RecordImageTextVideo textVideo = new RecordImageTextVideo(GoodsDetailActivitySuning.this);
                    String url = textVideo.getvideoMoreUrl();
                    if (StringUtils.isEmpty(url)) {
                        url = textVideo.gettxtImgUtl();
                    }
                    Intent intent = new Intent(GoodsDetailActivitySuning.this, ShareBrowserActivity.class);
                    intent.putExtra("url", url);
                    startActivity(intent);
                } else if (position == 2) {
//                    startActivity(new Intent(GoodsDetailActivityTB.this, ContactUsActivity.class));
                    KeFuUtil.jumpKeFu(GoodsDetailActivitySuning.this, "商品详情");
                } else if (position == 3) {
                } else if (position == 1) {
                    startActivity(new Intent(GoodsDetailActivitySuning.this, GoComplainActivity.class));
                }
            }
@@ -900,6 +886,11 @@
                    sList = mInfo.getExtra().getListShareUser();
                    if (sList == null)
                        sList = new ArrayList<>();

                    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)
@@ -938,6 +929,7 @@


                    //设置推荐信息
                    mInfo.getGoods().setDescription("");
                    if (StringUtils.isEmpty(mInfo.getGoods().getDescription())) {
                        ll_recommend.setVisibility(View.GONE);
                    } else {
@@ -1376,20 +1368,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;

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/GoodsDetailActivityTB.java

@@ -602,7 +602,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);
@@ -610,10 +610,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);

@@ -631,23 +631,9 @@
//                    Toast.makeText(GoodsDetailActivityTB.this, "链接复制成功", Toast.LENGTH_LONG).show();
//                } else
                if (position == 0) {
                    Intent intent1 = new Intent(GoodsDetailActivityTB.this, ShareBrowserActivity.class);
                    intent1.putExtra("title", "帮助中心");
                    intent1.putExtra("url", sp.getString("help", ""));
                    startActivity(intent1);
                } else if (position == 1) {
                    RecordImageTextVideo textVideo = new RecordImageTextVideo(GoodsDetailActivityTB.this);
                    String url = textVideo.getvideoMoreUrl();
                    if (StringUtils.isEmpty(url)) {
                        url = textVideo.gettxtImgUtl();
                    }
                    Intent intent = new Intent(GoodsDetailActivityTB.this, ShareBrowserActivity.class);
                    intent.putExtra("url", url);
                    startActivity(intent);
                } else if (position == 2) {
//                    startActivity(new Intent(GoodsDetailActivityTB.this, ContactUsActivity.class));
                    KeFuUtil.jumpKeFu(GoodsDetailActivityTB.this, "商品详情");
                } else if (position == 3) {
                } else if (position == 1) {
                    startActivity(new Intent(GoodsDetailActivityTB.this, GoComplainActivity.class));
                }
            }
@@ -834,6 +820,7 @@
                    tv_rebate_num.setText(" 返" + mInfo.getGoods().getMoneyInfo().getFanliMoney());
                    tv_rebate_num.setVisibility(View.GONE);
                    //设置推荐信息
                    mInfo.getGoods().setDescription("");
                    if (StringUtils.isEmpty(mInfo.getGoods().getDescription())) {
                        ll_recommend.setVisibility(View.GONE);
                    } else {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/GoodsDetailActivityVIP.java

@@ -207,7 +207,6 @@
    }



    /*
    商品详情免单券弹框接口
 */
@@ -702,7 +701,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);
@@ -710,10 +709,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);

@@ -732,23 +731,9 @@
//                } else

                if (position == 0) {
                    Intent intent1 = new Intent(GoodsDetailActivityVIP.this, ShareBrowserActivity.class);
                    intent1.putExtra("title", "帮助中心");
                    intent1.putExtra("url", sp.getString("help", ""));
                    startActivity(intent1);
                } else if (position == 1) {
                    RecordImageTextVideo textVideo = new RecordImageTextVideo(GoodsDetailActivityVIP.this);
                    String url = textVideo.getvideoMoreUrl();
                    if (StringUtils.isEmpty(url)) {
                        url = textVideo.gettxtImgUtl();
                    }
                    Intent intent = new Intent(GoodsDetailActivityVIP.this, ShareBrowserActivity.class);
                    intent.putExtra("url", url);
                    startActivity(intent);
                } else if (position == 2) {
//                    startActivity(new Intent(GoodsDetailActivityTB.this, ContactUsActivity.class));
                    KeFuUtil.jumpKeFu(GoodsDetailActivityVIP.this, "商品详情");
                } else if (position == 3) {
                } else if (position == 1) {
                    startActivity(new Intent(GoodsDetailActivityVIP.this, GoComplainActivity.class));
                }
            }
@@ -908,6 +893,10 @@
                    h5Url = mInfo.getExtra().getH5Url();//产品h5 链接
                    couponUsers = mInfo.getExtra().getListCouponUser();
                    sList = mInfo.getExtra().getListShareUser();
                    if (couponUsers != null)
                        couponUsers.clear();
                    if (sList != null)
                        sList.clear();
                    if (sList == null)
                        sList = new ArrayList<>();
                    noRebateHelpLink = mInfo.getExtra().getShare().getHelpLink();
@@ -949,6 +938,7 @@


                    //设置推荐信息
                    mInfo.getGoods().setDescription("");
                    if (StringUtils.isEmpty(mInfo.getGoods().getDescription())) {
                        ll_recommend.setVisibility(View.GONE);
                    } else {
@@ -1309,20 +1299,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;
@@ -1524,7 +1514,6 @@
            }
        });
    }



    class ImageAdapter extends PagerAdapter {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/RecommendCategoryFragment.java

@@ -306,7 +306,7 @@
                            if (mList.size() == count) {
                                bottom.setVisibility(View.VISIBLE);
                                iv_loading.setVisibility(View.GONE);
                                tv_loading.setText("-到底了*^_^*-");
                                tv_loading.setText(getResources().getString(R.string.list_no_more));
                            }
                            requestState(mList.size() == 0 ? 1 : 0);
                        } else {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/RecommendFragment.java

@@ -1237,7 +1237,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    requestState(mList.size() == 0 ? 1 : 0);


 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/SearchMultipleAdapter.java

@@ -53,7 +53,7 @@

        if (selectItems.contains(position)) {
            iv_selected.setVisibility(View.VISIBLE);
            tv_content.setTextColor(mContext.getResources().getColor(R.color.main_text_color));
            tv_content.setTextColor(mContext.getResources().getColor(R.color.theme));
        } else {
            iv_selected.setVisibility(View.INVISIBLE);
            tv_content.setTextColor(mContext.getResources().getColor(R.color.black));

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/SearchResultAdapter.java

@@ -156,7 +156,7 @@
                viewHolder.ll_shop1.setVisibility(View.GONE);
                viewHolder.v_top.setVisibility(position == 0 ? View.VISIBLE : View.GONE);
            }
            viewHolder.tv_price1.setTextColor(mContext.getResources().getColor(R.color.main_text_color));
            viewHolder.tv_price1.setTextColor(mContext.getResources().getColor(R.color.theme));

            if (info.getMoneyInfo().getMoneyType() == 1) {
                viewHolder.tv_favourable1.setBackgroundResource(R.drawable.shape_goods_list_price_fan);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/SearchResultHyperMarketFragment.java

@@ -267,7 +267,7 @@
            fl_search_bar_common.setVisibility(View.GONE);
            fl_search_bar_vip.setVisibility(View.VISIBLE);
            order = 0;
            tv_default.setTextColor(order == 0 ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black));
            tv_default.setTextColor(order == 0 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black));
        } else {
            fl_search_bar_common.setVisibility(View.VISIBLE);
            fl_search_bar_vip.setVisibility(View.GONE);
@@ -569,7 +569,7 @@
                            if (wList.size() >= count) {
                                bottom.setVisibility(View.VISIBLE);
                                iv_loading.setVisibility(View.GONE);
                                tv_loading.setText("-到底了*^_^*-");
                                tv_loading.setText(getResources().getString(R.string.list_no_more));
                            }
                            if (wList.size() == 0) {
                                iv_footermark.setVisibility(View.GONE);
@@ -632,7 +632,7 @@
                    iv_has_coupon.setImageResource(R.drawable.shape_has_coupon_unselected);
                } else {
                    filter.setCoupon(true);
                    tv_has_coupon.setTextColor(getResources().getColor(R.color.main_text_color));
                    tv_has_coupon.setTextColor(getResources().getColor(R.color.theme));
                    iv_has_coupon.setImageResource(R.drawable.shape_has_coupon_selected);
                }
                hidePwFilter();
@@ -717,7 +717,7 @@
                    pw_filter.showAsDropDown(ll_has_coupon);
                    iv_filter.setImageResource(R.drawable.ic_multiple_open);
                }
                tv_filter.setTextColor(getResources().getColor(R.color.main_text_color));
                tv_filter.setTextColor(getResources().getColor(R.color.theme));
                SearchCustomEvent.searchResultZhonghe(getActivity());
                break;
            case R.id.fl_rebate_scale://返利比
@@ -775,16 +775,16 @@
        page = 1;
        hidePwFilter();
        iv_price.setImageResource(order == 2 ? R.mipmap.ic_grade_down : order == 3 ? R.mipmap.ic_sort_ascending : R.mipmap.ic_sort_no_selected);
        tv_rebate_scale.setTextColor(order == 4 ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black));
        tv_price.setTextColor((order == 2 || order == 3) ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black));
        tv_price_vip.setTextColor((order == 2 || order == 3) ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black));
        tv_rebate_scale.setTextColor(order == 4 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black));
        tv_price.setTextColor((order == 2 || order == 3) ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black));
        tv_price_vip.setTextColor((order == 2 || order == 3) ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black));
        if (goodsType != Constant.GOODS_TYPE_SUNING) {
            tv_sale_num.setTextColor(order == 1 ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black));
            tv_sale_num.setTextColor(order == 1 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black));
        } else
            tv_sale_num.setTextColor(order == 0 ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black));
            tv_sale_num.setTextColor(order == 0 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black));

        tv_default.setTextColor(order == 0 ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black));
        tv_discount.setTextColor(order == 5 ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black));
        tv_default.setTextColor(order == 0 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black));
        tv_discount.setTextColor(order == 5 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black));
        iv_price_vip.setImageResource(order == 2 ? R.mipmap.ic_grade_down : order == 3 ? R.mipmap.ic_sort_ascending : R.mipmap.ic_sort_no_selected);
        rl_search.setRefreshing(true);
        setData(page);
@@ -795,19 +795,19 @@
     */
    private void fillterColor() {
        if (goodsType == Constant.GOODS_TYPE_TB) {
            tv_filter.setTextColor(filter.isTmall() ? getResources().getColor(R.color.main_text_color)
            tv_filter.setTextColor(filter.isTmall() ? getResources().getColor(R.color.theme)
                    : getResources().getColor(R.color.black));
            iv_filter.setImageResource(filter.isTmall() ? R.drawable.ic_multiple_close : R.drawable.ic_multiple_unselected);
        } else if (goodsType == Constant.GOODS_TYPE_JD) {
            tv_filter.setTextColor(filter.isZy() ? getResources().getColor(R.color.main_text_color)
            tv_filter.setTextColor(filter.isZy() ? getResources().getColor(R.color.theme)
                    : getResources().getColor(R.color.black));
            iv_filter.setImageResource(filter.isZy() ? R.drawable.ic_multiple_close : R.drawable.ic_multiple_unselected);
        } else if (goodsType == Constant.GOODS_TYPE_PDD) {
            tv_filter.setTextColor(filter.isBrand() ? getResources().getColor(R.color.main_text_color)
            tv_filter.setTextColor(filter.isBrand() ? getResources().getColor(R.color.theme)
                    : getResources().getColor(R.color.black));
            iv_filter.setImageResource(filter.isBrand() ? R.drawable.ic_multiple_close : R.drawable.ic_multiple_unselected);
        } else if (goodsType == Constant.GOODS_TYPE_SUNING) {
            tv_filter.setTextColor(mulAdapter.getSelectCount() > 0 ? getResources().getColor(R.color.main_text_color)
            tv_filter.setTextColor(mulAdapter.getSelectCount() > 0 ? getResources().getColor(R.color.theme)
                    : getResources().getColor(R.color.black));
            iv_filter.setImageResource(mulAdapter.getSelectCount() > 0 ? R.drawable.ic_multiple_close : R.drawable.ic_multiple_unselected);
        }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/SelfBuyAndReductionActivity.java

@@ -220,7 +220,7 @@
                            if (mList.size() == count) {
                                bottom.setVisibility(View.VISIBLE);
                                iv_loading.setVisibility(View.GONE);
                                tv_loading.setText("-到底了*^_^*-");
                                tv_loading.setText(getResources().getString(R.string.list_no_more));
                            }
                            String topPicture = jsonObject.optJSONObject("data").optString("topPicture");//banner图片
                            //显示 无数据图片

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/ShareExplosionsGoodsDetailActivity.java

@@ -1431,18 +1431,18 @@
            case R.id.tv_refresh:
                startActivity(new Intent(Settings.ACTION_SETTINGS));
                break;
            case R.id.fl_goods_detail:
                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 (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:
                GoodsCustomEvent.goodsDetailShopDetail(ShareExplosionsGoodsDetailActivity.this);
                if (mInfo != null && (!StringUtils.isEmpty(mInfo.getGoods().getShopInfo().getShopLink()))) {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/ShareExplosionsListActivity.java

@@ -181,7 +181,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                }
            }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/TopMenuRightPopContentAdapter.java

@@ -46,8 +46,9 @@
        view = LayoutInflater.from(mContext).inflate(R.layout.item_goods_detail_topright_jump, null);
        TextView tv_content = view.findViewById(R.id.tv_content);
        tv_content.setText(mList.get(position).getName());
        tv_content.setCompoundDrawablesWithIntrinsicBounds(mList.get(position).getDrawableLeftId(),
                0, 0, 0);
        if (mList.get(position).getDrawableLeftId() != null)
            tv_content.setCompoundDrawablesWithIntrinsicBounds(mList.get(position).getDrawableLeftId(),
                    0, 0, 0);

        return view;
    }

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/singleshare/FastShareFragment.java

@@ -731,7 +731,7 @@
    @Override
    public void onResume() {
        super.onResume();
        singleImageFragment.setInviteCodeShowState(ShareCacheUtil.isFastShareImageShowInviteCode(getContext()));
        singleImageFragment.setInviteCodeShowState(false);
    }

    private PermissionHelper mPermissionsChecker; // 权限检测器
@@ -869,8 +869,6 @@
                //设置图片顺序
                initImgSelector();
            }


        }
    }


 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/sellwellcommodity/RealTimeChildFragment.java

@@ -186,7 +186,7 @@
                    if (mList.size() >= count && mList.size() > 5) { //下拉数据请求完 到底了
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    } else {  //下拉还有数据时
                        if (bottom.getVisibility() == View.VISIBLE) {
                            bottom.setVisibility(View.GONE);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/sellwellcommodity/SellWellGoods.java

@@ -147,11 +147,11 @@
     * 改变 titiel
     */
    private void Variety(int i) {
        sellsellgoods_bar_realtime.setTextColor(Color.parseColor(i == 1 ? "#ffe5005c" : "#ff333333"));
        sellsellgoods_bar_realtime.setTextColor(i == 1 ? getResources().getColor(R.color.theme): Color.parseColor("#ff333333"));
        sellsellgoods_bar_realtimebottom.setVisibility(i == 1 ? View.VISIBLE : View.GONE);
        sellsellgoods_bar_today.setTextColor(Color.parseColor(i == 2 ? "#ffe5005c" : "#ff333333"));
        sellsellgoods_bar_today.setTextColor(i == 2? getResources().getColor(R.color.theme): Color.parseColor("#ff333333"));
        sellsellgoods_bar_todaybottom.setVisibility(i == 2 ? View.VISIBLE : View.GONE);
        sellsellgoods_bar_sellwell.setTextColor(Color.parseColor(i == 3 ? "#ffe5005c" : "#ff333333"));
        sellsellgoods_bar_sellwell.setTextColor(i == 2? getResources().getColor(R.color.theme): Color.parseColor("#ff333333"));
        sellsellgoods_bar_sellwellbottom.setVisibility(i == 3 ? View.VISIBLE : View.GONE);
    }


 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/sellwellcommodity/Sell_Fragment.java

@@ -190,7 +190,7 @@
                    if (mList.size() >= count) { //下拉数据请求完 到底了
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    } else {  //下拉还有数据时
                        if (bottom.getVisibility() == View.VISIBLE) {
                            bottom.setVisibility(View.GONE);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/sellwellcommodity/TodayChlidFragment.java

@@ -185,7 +185,7 @@
                    if (mList.size() >= count && mList.size() > 5) { //下拉数据请求完 到底了
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    } else {  //下拉还有数据时
                        if (bottom.getVisibility() == View.VISIBLE) {
                            bottom.setVisibility(View.GONE);

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/trends/CollegeFragmet.java

@@ -406,7 +406,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    requestState(mList.size() == 0 ? 1 : 0);
                } else {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/trends/CollegeSearchResultActivity.java

@@ -241,7 +241,7 @@
                    if (mList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    requestState(mList.size() == 0 ? 1 : 0);
                } else {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/trends/SendCircleFragmet.java

@@ -498,7 +498,7 @@
                    if (mContentList.size() == count) {
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    }
                    requestState((mContentList.size() == 0 && mBannerList.size() == 0) ? 1 : 0);
                } else {

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/trends/Trends2Fragmet.java

@@ -445,7 +445,7 @@
                            if (mList.size() == count) {
                                bottom.setVisibility(View.VISIBLE);
                                iv_loading.setVisibility(View.GONE);
                                tv_loading.setText("-到底了*^_^*-");
                                tv_loading.setText(getResources().getString(R.string.list_no_more));
                            }



 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/util/AdUtil.java

New file
@@ -0,0 +1,38 @@
package com.yeshi.ec.rebate.myapplication.util;

import android.content.Context;
import android.content.SharedPreferences;

import com.google.gson.Gson;
import com.yeshi.ec.rebate.myapplication.entity.user.GDTAdInfo;
import com.yeshi.ec.rebate.myapplication.util.downutil.StringUtils;

public class AdUtil {

    /**
     * 保存广点通的广告配置信息
     *
     * @param context
     * @param info
     */
    public static void saveGDTADInfo(Context context, GDTAdInfo info) {
        SharedPreferences ad = context.getSharedPreferences("gdtAd", Context.MODE_PRIVATE);
        ad.edit().putString("account", new Gson().toJson(info)).commit();
    }

    /**
     * 获取广点通广告信息
     *
     * @param context
     * @return
     */
    public static GDTAdInfo getGDTADInfo(Context context) {
        SharedPreferences ad = context.getSharedPreferences("gdtAd", Context.MODE_PRIVATE);
        String info = ad.getString("account", "");
        if (StringUtils.isNullOrEmpty(info))
            return null;
        GDTAdInfo adInfo = new Gson().fromJson(info, GDTAdInfo.class);
        return adInfo;
    }

}

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/util/ui/ColorUtil.java

New file
@@ -0,0 +1,10 @@
package com.yeshi.ec.rebate.myapplication.util.ui;

public class ColorUtil {
    public static String getHexString(int color) {
        String s = "#";
        int colorStr = (color & 0xff000000) | (color & 0x00ff0000) | (color & 0x0000ff00) | (color & 0x000000ff);
        s = s + Integer.toHexString(colorStr);
        return s;
    }
}

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/util/ui/MineFunctionsManager.java

@@ -97,9 +97,9 @@
        UserCustomEvent.userOrder(context);
        if (!isLogin()) {
            UserUtil.jumpLogin(context);
            Toast.makeText(context, String.format("请先登录%s账号", context.getResources().getString(R.string.app_name)), Toast.LENGTH_LONG).show();
        } else {
            context.startActivity(new Intent(context, OrderActivity33.class));
            Toast.makeText(context, String.format("请先登录%s账号", context.getResources().getString(R.string.app_name)), Toast.LENGTH_LONG).show();
        }
    }


 MDShopping/src/main/res/drawable-xhdpi/ic_category_selected.png

 MDShopping/src/main/res/drawable-xhdpi/ic_collect_delete.png

 MDShopping/src/main/res/drawable-xhdpi/ic_collect_delete_checked.png

 MDShopping/src/main/res/drawable-xhdpi/ic_default_portrait.png

 MDShopping/src/main/res/drawable-xhdpi/ic_default_portrait_light.png

 MDShopping/src/main/res/drawable-xhdpi/ic_defaultavatar.png

 MDShopping/src/main/res/drawable-xhdpi/ic_launcher.png

 MDShopping/src/main/res/drawable-xhdpi/ic_mine_default_portrait.png

 MDShopping/src/main/res/drawable-xhdpi/ic_multiple_close.png

 MDShopping/src/main/res/drawable-xhdpi/ic_multiple_open.png

 MDShopping/src/main/res/drawable-xhdpi/ic_order_appeal_top.png

 MDShopping/src/main/res/drawable-xhdpi/icon_collected.png

 MDShopping/src/main/res/drawable-xhdpi/icon_un_collected.png

 MDShopping/src/main/res/drawable-xxhdpi/ic_launcher.png

 MDShopping/src/main/res/drawable-xxxhdpi/ic_launcher.png

 MDShopping/src/main/res/drawable/shape_contact_right.xml

@@ -4,5 +4,5 @@
    <corners
        android:bottomRightRadius="20dp"
        android:topRightRadius="20dp" />
    <solid android:color="@color/main_text_color" />
    <solid android:color="@color/theme" />
</shape>

 MDShopping/src/main/res/drawable/shape_dialog_user_protocol_positive.xml

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <corners android:radius="40dp" />
    <solid android:color="@color/main_text_color" />
    <solid android:color="@color/theme" />
</shape>

 MDShopping/src/main/res/drawable/shape_go_search3.xml

@@ -4,8 +4,8 @@
    <corners
        android:bottomRightRadius="8dp"
        android:topRightRadius="8dp" />
    <solid android:color="@color/main_text_color" />
    <solid android:color="@color/theme" />
    <stroke
        android:width="1px"
        android:color="@color/main_text_color" />
        android:color="@color/theme" />
</shape>

 MDShopping/src/main/res/drawable/shape_has_coupon_selected.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="8dp" />
    <solid android:color="@color/main_text_color" />
    <solid android:color="@color/theme" />
</shape>

 MDShopping/src/main/res/drawable/shape_input_cursor.xml

New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <size android:width="2dp" />
    <solid android:color="@color/theme" />
</shape>

 MDShopping/src/main/res/drawable/shape_order_state2.xml

@@ -4,5 +4,5 @@
    <solid android:color="@color/white" />
    <stroke
        android:width="1dp"
        android:color="@color/main_text_color" />
        android:color="@color/theme" />
</shape>

 MDShopping/src/main/res/drawable/shape_red_goods_detail_composition_corner.xml

@@ -3,6 +3,6 @@

    <corners android:radius="4dp"></corners>

    <solid android:color="@color/detail_rebate_money_bg"></solid>
    <solid android:color="@color/theme_bg"></solid>

</shape>

 MDShopping/src/main/res/drawable/shape_red_goods_detail_corner.xml

@@ -3,6 +3,6 @@

    <corners android:radius="3dp"></corners>

    <solid android:color="@color/detail_rebate_money_bg"></solid>
    <solid android:color="@color/theme"></solid>

</shape>

 MDShopping/src/main/res/drawable/shape_red_voucher_left.xml

@@ -7,6 +7,6 @@
        android:topLeftRadius="3dp"
        android:topRightRadius="0dp" />

    <solid android:color="@color/main_text_color"></solid>
    <solid android:color="@color/theme"></solid>

</shape>

 MDShopping/src/main/res/drawable/shape_search_filter_left.xml

@@ -4,5 +4,5 @@
    <corners
        android:bottomLeftRadius="20dp"
        android:topLeftRadius="20dp" />
    <solid android:color="@color/search_filter_reset" />
    <solid android:color="@color/theme_bg" />
</shape>

 MDShopping/src/main/res/drawable/shape_smart_search_top.xml

@@ -4,8 +4,8 @@
    <solid android:color="#ffffffff" />
    <gradient
        android:angle="270"
        android:endColor="#ffff0066"
        android:startColor="#ffff5398"
        android:endColor="@color/theme"
        android:startColor="@color/theme"
        android:type="linear" />
    <corners
        android:bottomLeftRadius="0dp"

 MDShopping/src/main/res/drawable/shape_thrends2.xml

@@ -5,5 +5,5 @@
    <solid android:color="@color/white" />
    <stroke
        android:width="1px"
        android:color="@color/main_text_color" />
        android:color="@color/theme" />
</shape>

 MDShopping/src/main/res/layout/activity_activationinvitecode.xml

@@ -107,6 +107,7 @@
                android:orientation="vertical">

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:id="@+id/et_verify_code_num"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"

 MDShopping/src/main/res/layout/activity_brandinfoall.xml

@@ -62,7 +62,7 @@
                    android:layout_marginTop="1dp"
                    android:gravity="center"
                    android:singleLine="true"
                    android:text="-到底了*^_^*-"
                    android:text="@string/list_no_more"
                    android:textSize="12sp" />
            </LinearLayout>
        </LinearLayout>

 MDShopping/src/main/res/layout/activity_collect28.xml

@@ -198,7 +198,7 @@
                                android:drawablePadding="8dp"
                                android:gravity="center"
                                android:text="删除"
                                android:textColor="@color/main_text_color"
                                android:textColor="@color/theme"
                                android:textSize="14sp" />
                        </FrameLayout>
                    </LinearLayout>

 MDShopping/src/main/res/layout/activity_college_search.xml

@@ -40,6 +40,7 @@
            android:layout_weight="1">

            <EditText
                android:textCursorDrawable="@drawable/shape_input_cursor"
                android:id="@+id/et_search"
                android:layout_width="match_parent"
                android:layout_height="33dp"

 MDShopping/src/main/res/layout/activity_contact_us.xml

@@ -84,6 +84,7 @@
                        android:background="@drawable/shape_custom_service_input">

                        <EditText
                            android:textCursorDrawable="@drawable/shape_input_cursor"
                            android:id="@+id/et_content"
                            android:layout_width="match_parent"
                            android:layout_height="match_parent"

 MDShopping/src/main/res/layout/activity_go_complain.xml

@@ -72,6 +72,7 @@
                    </com.wpc.library.widget.MyGridView>

                    <EditText
                        android:textCursorDrawable="@drawable/shape_input_cursor"
                        android:id="@+id/et_content"
                        android:layout_width="match_parent"
                        android:layout_height="180dp"

 MDShopping/src/main/res/layout/activity_goods_detail_transition.xml

@@ -412,7 +412,7 @@
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:visibility="gone"
                app:indicatorColor="@color/red"
                app:indicatorColor="@color/theme"
                app:indicatorName="BallPulseIndicator" />
        </FrameLayout>


 MDShopping/src/main/res/layout/activity_login_mobile.xml

@@ -75,6 +75,7 @@
            android:orientation="horizontal">

            <EditText
                android:textCursorDrawable="@drawable/shape_input_cursor"
                android:id="@+id/et_verification_code"
                android:layout_width="0dp"
                android:layout_height="match_parent"

 MDShopping/src/main/res/layout/activity_my_wxchat.xml

@@ -35,6 +35,7 @@
            android:background="@color/white">

            <EditText
                android:textCursorDrawable="@drawable/shape_input_cursor"
                android:id="@+id/et_wechat_num"
                android:layout_width="0dp"
                android:layout_height="wrap_content"

 MDShopping/src/main/res/layout/activity_myinvitecode.xml

@@ -20,6 +20,7 @@
        android:background="@color/white">

        <EditText
            android:textCursorDrawable="@drawable/shape_input_cursor"
            android:id="@+id/et_invitecode"
            android:layout_width="0dp"
            android:layout_height="wrap_content"

 MDShopping/src/main/res/layout/activity_mynickanme.xml

@@ -29,6 +29,7 @@
        android:background="@color/white">

        <EditText
            android:textCursorDrawable="@drawable/shape_input_cursor"
            android:id="@+id/mynickanme_memoName"
            android:layout_width="0dp"
            android:layout_height="wrap_content"

 MDShopping/src/main/res/layout/activity_myplayer_search.xml

@@ -43,6 +43,7 @@
                android:layout_marginLeft="5dp">

                <AutoCompleteTextView
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:id="@+id/et_search"
                    android:layout_width="match_parent"
                    android:layout_height="35dp"

 MDShopping/src/main/res/layout/activity_myplayer_search_result.xml

@@ -59,6 +59,7 @@
                            android:paddingLeft="35dp"
                            android:paddingRight="8dp"
                            android:singleLine="true"
                            android:textCursorDrawable="@drawable/shape_input_cursor"
                            android:textSize="14sp" />

                        <ImageView

 MDShopping/src/main/res/layout/activity_order33.xml

@@ -83,6 +83,7 @@
                    android:visibility="gone" />

                <ImageView
                    android:visibility="gone"
                    android:id="@+id/iv_three_red_point"
                    android:layout_width="25dp"
                    android:layout_height="25dp"
@@ -121,7 +122,7 @@
                            android:layout_height="match_parent"
                            android:gravity="center"
                            android:text="全部"
                            android:textColor="@color/main_text_color"
                            android:textColor="@color/theme"
                            android:textSize="17sp" />

                        <ImageView
@@ -188,6 +189,7 @@
                </FrameLayout>

                <FrameLayout
                    android:visibility="gone"
                    android:id="@+id/fl_order_filter"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
@@ -208,24 +210,6 @@
                android:background="@color/trends_goods_bg" />

            <include layout="@layout/item_yellow_notice" />

            <FrameLayout
                android:id="@+id/ll_orderfl"
                android:layout_width="match_parent"
                android:layout_height="42dp"
                android:background="@color/white"
                android:visibility="gone">

                <TextView
                    android:id="@+id/ll_orderhelp"
                    android:layout_width="143dp"
                    android:layout_height="24dp"
                    android:layout_gravity="center"
                    android:gravity="center"
                    android:text="没有被统计？"
                    android:textColor="#ffffffff"
                    android:textSize="12sp" />
            </FrameLayout>

            <View
                android:layout_width="match_parent"

 MDShopping/src/main/res/layout/activity_order_form_num_search.xml

@@ -29,6 +29,7 @@
            android:layout_weight="1">

            <AutoCompleteTextView
                android:textCursorDrawable="@drawable/shape_input_cursor"
                android:id="@+id/et_search"
                android:layout_width="match_parent"
                android:layout_height="35dp"

 MDShopping/src/main/res/layout/activity_order_search_result.xml

@@ -36,6 +36,7 @@
            android:layout_weight="1">

            <AutoCompleteTextView
                android:textCursorDrawable="@drawable/shape_input_cursor"
                android:id="@+id/et_search"
                android:layout_width="match_parent"
                android:layout_height="30dp"

 MDShopping/src/main/res/layout/activity_revise_account.xml

@@ -74,6 +74,7 @@
            android:layout_height="match_parent">

            <EditText
                android:textCursorDrawable="@drawable/shape_input_cursor"
                android:id="@+id/et_num"
                android:layout_width="match_parent"
                android:layout_height="match_parent"

 MDShopping/src/main/res/layout/activity_search.xml

@@ -41,6 +41,7 @@
                android:paddingLeft="39dp"
                android:paddingRight="5dp"
                android:singleLine="true"
                android:textCursorDrawable="@drawable/shape_input_cursor"
                android:textSize="14sp" />

            <ImageView

 MDShopping/src/main/res/layout/activity_search_result.xml

@@ -65,6 +65,7 @@
                            android:paddingLeft="35dp"
                            android:paddingRight="8dp"
                            android:singleLine="true"
                            android:textCursorDrawable="@drawable/shape_input_cursor"
                            android:textSize="14sp" />

                        <ImageView

 MDShopping/src/main/res/layout/activity_settings.xml

@@ -490,7 +490,7 @@
                    android:layout_height="wrap_content"
                    android:gravity="center_vertical"
                    android:text="退出当前账号"
                    android:textColor="@color/main_text_color" />
                    android:textColor="@color/theme" />
            </LinearLayout>
        </LinearLayout>
    </ScrollView>

 MDShopping/src/main/res/layout/activity_unbind_mobile.xml

@@ -25,6 +25,7 @@
        android:textSize="16sp" />

    <EditText
        android:textCursorDrawable="@drawable/shape_input_cursor"
        android:id="@+id/et_mobile_num"
        android:layout_width="match_parent"
        android:layout_height="40dp"

 MDShopping/src/main/res/layout/dialog_give_redpacket.xml

@@ -55,6 +55,7 @@
                android:textSize="24sp" />

            <EditText
                android:textCursorDrawable="@drawable/shape_input_cursor"
                android:id="@+id/tv_num"
                android:layout_width="match_parent"
                android:layout_height="30dp"

 MDShopping/src/main/res/layout/fragment_myteam_mark_info.xml

@@ -33,6 +33,7 @@
                android:background="@color/white">

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:id="@+id/et_memoName"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"

 MDShopping/src/main/res/layout/fragment_order_appeal.xml

@@ -35,6 +35,7 @@
                android:orientation="horizontal">

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:id="@+id/et_order_id"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
@@ -90,7 +91,7 @@
                    android:layout_marginRight="15dp"
                    android:gravity="center_vertical|right"
                    android:text="订单找回是什么?"
                    android:textColor="@color/main_text_color"
                    android:textColor="@color/theme"
                    android:textSize="15sp" />
            </android.support.v7.widget.LinearLayoutCompat>


 MDShopping/src/main/res/layout/fragment_recommend_category.xml

@@ -67,6 +67,7 @@
                        android:background="@drawable/shape_search2">

                        <AutoCompleteTextView
                            android:textCursorDrawable="@drawable/shape_input_cursor"
                            android:id="@+id/et_search"
                            android:layout_width="match_parent"
                            android:layout_height="35dp"

 MDShopping/src/main/res/layout/item_brandshoplis.xml

@@ -130,36 +130,46 @@
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content" />
                <!--************************************************券-->
                <android.support.v7.widget.LinearLayoutCompat


                <LinearLayout
                    android:id="@+id/item_brandshoplis_couponLy1"
                    android:layout_width="wrap_content"
                    android:layout_height="22dp"
                    android:layout_gravity="right|bottom"
                    android:layout_marginRight="5dp"
                    android:layout_marginBottom="9dp">
                    android:layout_height="20dp"
                    android:layout_gravity="bottom|right"
                    android:layout_marginRight="8dp"
                    android:orientation="horizontal">

                    <TextView
                        android:layout_width="22dp"
                        android:layout_height="match_parent"
                        android:background="@drawable/shape_red_voucher_left"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_gravity="center_vertical"
                        android:background="@drawable/shape_coupon_bg"
                        android:gravity="center"
                        android:includeFontPadding="false"
                        android:paddingLeft="4dp"
                        android:paddingTop="3dp"
                        android:paddingRight="4dp"
                        android:paddingBottom="3dp"
                        android:text="券"
                        android:textColor="@color/white"
                        android:textSize="13sp" />
                    <!--*****************************************優惠券价1-->
                        android:layout_marginRight="-1dp"
                        android:textColor="@color/theme"
                        android:textSize="12sp" />

                    <TextView
                        android:id="@+id/item_brandshoplis_coupon1"
                        android:layout_width="match_parent"
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
                        android:background="@drawable/shape_red_voucher_rigth"
                        android:gravity="center"
                        android:layout_gravity="center_vertical"
                        android:background="@drawable/shape_coupon_value_right"
                        android:gravity="center_vertical"
                        android:includeFontPadding="false"
                        android:maxLines="1"
                        android:paddingLeft="5dp"
                        android:paddingRight="5dp"
                        android:textColor="@color/main_text_color"
                        android:textSize="13sp" />

                </android.support.v7.widget.LinearLayoutCompat>

                        android:textColor="@color/theme"
                        android:textSize="12sp" />
                </LinearLayout>
            </FrameLayout>


@@ -183,7 +193,7 @@
                android:minWidth="70dp"
                android:paddingLeft="2dp"
                android:paddingRight="2dp"
                android:textColor="@color/main_text_color"
                android:textColor="@color/white"
                android:textSize="14sp" />
        </LinearLayout>

@@ -206,35 +216,44 @@
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content" />
                <!--************************************************券-->
                <android.support.v7.widget.LinearLayoutCompat
                <LinearLayout
                    android:id="@+id/item_brandshoplis_couponLy2"
                    android:layout_width="wrap_content"
                    android:layout_height="22dp"
                    android:layout_gravity="right|bottom"
                    android:layout_marginRight="5dp"
                    android:layout_marginBottom="9dp">
                    android:layout_height="20dp"
                    android:layout_gravity="bottom|right"
                    android:layout_marginRight="8dp"
                    android:orientation="horizontal">

                    <TextView
                        android:layout_width="22dp"
                        android:layout_height="match_parent"
                        android:background="@drawable/shape_red_voucher_left"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_gravity="center_vertical"
                        android:background="@drawable/shape_coupon_bg"
                        android:gravity="center"
                        android:includeFontPadding="false"
                        android:paddingLeft="4dp"
                        android:paddingTop="3dp"
                        android:paddingRight="4dp"
                        android:paddingBottom="3dp"
                        android:text="券"
                        android:textColor="@color/white"
                        android:textSize="13sp" />
                    <!--*****************************************優惠券价2-->
                        android:layout_marginRight="-1dp"
                        android:textColor="@color/theme"
                        android:textSize="12sp" />

                    <TextView
                        android:id="@+id/item_brandshoplis_coupon2"
                        android:layout_width="match_parent"
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
                        android:background="@drawable/shape_red_voucher_rigth"
                        android:gravity="center"
                        android:layout_gravity="center_vertical"
                        android:background="@drawable/shape_coupon_value_right"
                        android:gravity="center_vertical"
                        android:includeFontPadding="false"
                        android:maxLines="1"
                        android:paddingLeft="5dp"
                        android:paddingRight="5dp"
                        android:textColor="@color/main_text_color"
                        android:textSize="13sp" />

                </android.support.v7.widget.LinearLayoutCompat>
                        android:textColor="@color/theme"
                        android:textSize="12sp" />
                </LinearLayout>

            </FrameLayout>

@@ -259,7 +278,7 @@
                android:minWidth="70dp"
                android:paddingLeft="2dp"
                android:paddingRight="2dp"
                android:textColor="@color/main_text_color"
                android:textColor="@color/white"
                android:textSize="14sp" />
        </LinearLayout>
        <!---*******************************商品三-->
@@ -282,35 +301,44 @@
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content" />
                <!--************************************************券-->
                <android.support.v7.widget.LinearLayoutCompat
                <LinearLayout
                    android:id="@+id/item_brandshoplis_couponLy3"
                    android:layout_width="wrap_content"
                    android:layout_height="22dp"
                    android:layout_gravity="right|bottom"
                    android:layout_marginRight="5dp"
                    android:layout_marginBottom="9dp">
                    android:layout_height="20dp"
                    android:layout_gravity="bottom|right"
                    android:layout_marginRight="8dp"
                    android:orientation="horizontal">

                    <TextView
                        android:layout_width="22dp"
                        android:layout_height="match_parent"
                        android:background="@drawable/shape_red_voucher_left"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_gravity="center_vertical"
                        android:background="@drawable/shape_coupon_bg"
                        android:gravity="center"
                        android:includeFontPadding="false"
                        android:paddingLeft="4dp"
                        android:paddingTop="3dp"
                        android:paddingRight="4dp"
                        android:paddingBottom="3dp"
                        android:text="券"
                        android:textColor="@color/white"
                        android:textSize="13sp" />
                    <!--*****************************************優惠券价2-->
                        android:layout_marginRight="-1dp"
                        android:textColor="@color/theme"
                        android:textSize="12sp" />

                    <TextView
                        android:id="@+id/item_brandshoplis_coupon3"
                        android:layout_width="match_parent"
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
                        android:background="@drawable/shape_red_voucher_rigth"
                        android:gravity="center"
                        android:layout_gravity="center_vertical"
                        android:background="@drawable/shape_coupon_value_right"
                        android:gravity="center_vertical"
                        android:includeFontPadding="false"
                        android:maxLines="1"
                        android:paddingLeft="5dp"
                        android:paddingRight="5dp"
                        android:textColor="@color/main_text_color"
                        android:textSize="13sp" />

                </android.support.v7.widget.LinearLayoutCompat>
                        android:textColor="@color/theme"
                        android:textSize="12sp" />
                </LinearLayout>

            </FrameLayout>

@@ -335,7 +363,7 @@
                android:minWidth="70dp"
                android:paddingLeft="2dp"
                android:paddingRight="2dp"
                android:textColor="@color/main_text_color"
                android:textColor="@color/white"
                android:textSize="14sp" />
        </LinearLayout>


 MDShopping/src/main/res/layout/item_braninfo_top.xml

@@ -115,7 +115,7 @@
                android:gravity="center"
                android:paddingBottom="1dp"
                android:text="进店"
                android:textColor="@color/main_text_color"
                android:textColor="@color/theme"
                android:textSize="13sp" />
        </android.support.v7.widget.LinearLayoutCompat>
        <!--        店铺二   -->

 MDShopping/src/main/res/layout/item_category_top_bar.xml

@@ -135,6 +135,7 @@
                android:orientation="horizontal">

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:id="@+id/et_low_price"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
@@ -182,6 +183,7 @@
            android:orientation="horizontal">

            <EditText
                android:textCursorDrawable="@drawable/shape_input_cursor"
                android:id="@+id/et_high_price"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
@@ -269,6 +271,7 @@
                    android:background="@drawable/shape_category_fillter">

                    <EditText
                        android:textCursorDrawable="@drawable/shape_input_cursor"
                        android:id="@+id/et_sale_num_select"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"

 MDShopping/src/main/res/layout/item_copy_link.xml

@@ -201,6 +201,7 @@
                            android:paddingRight="2dp"
                            android:paddingBottom="2dp"
                            android:text="券"
                            android:layout_marginRight="-1dp"
                            android:textColor="@color/theme"
                            android:textSize="10sp" />

@@ -340,7 +341,7 @@
            android:gravity="center"
            android:text="去看看"
            android:layout_marginRight="10dp"
            android:textColor="@color/main_text_color"
            android:textColor="@color/theme"
            android:textSize="16sp">

        </TextView>
@@ -349,9 +350,8 @@
            android:id="@+id/tv_go"
            android:layout_width="0dp"
            android:layout_height="40dp"

            android:layout_weight="5"
            android:background="@color/red6"
            android:background="@color/theme"
            android:gravity="center"
            android:textColor="#ffffffff"
            android:textSize="16sp" />

 MDShopping/src/main/res/layout/item_coupon_top.xml

@@ -60,6 +60,7 @@
                    android:layout_gravity="center_vertical|left"
                    android:background="@drawable/shape_search"
                    android:drawableLeft="@drawable/ic_recommend_search"
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:drawablePadding="10dp"
                    android:gravity="left|center_vertical"
                    android:hint="输入宝贝/商品名称"

 MDShopping/src/main/res/layout/item_dialog_withdraw2.xml

@@ -16,6 +16,7 @@
        android:textSize="16sp" />

    <EditText
        android:textCursorDrawable="@drawable/shape_input_cursor"
        android:layout_width="match_parent"
        android:layout_height="38dp"
        android:layout_marginLeft="12dp"

 MDShopping/src/main/res/layout/item_edit_text_preview.xml

@@ -13,6 +13,7 @@
        android:padding="20dp">

        <EditText
            android:textCursorDrawable="@drawable/shape_input_cursor"
            android:id="@+id/tv_content"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"

 MDShopping/src/main/res/layout/item_good_detail_transition_bottom.xml

@@ -22,29 +22,25 @@
            android:orientation="horizontal">

            <View
                android:layout_width="25dp"
                android:layout_width="50dp"
                android:layout_height="1dp"
                android:layout_gravity="center_vertical"
                android:background="@color/main_text_color" />
                android:background="#444444"></View>

            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:layout_marginLeft="12dp"
                android:layout_marginRight="12dp"
                android:drawableLeft="@drawable/ic_des_guesslike_top"
                android:drawablePadding="12dp"
                android:layout_gravity="center_vertical|center"
                android:layout_marginLeft="6.5dp"
                android:layout_marginRight="6.5dp"
                android:gravity="center"
                android:text="猜你喜欢"
                android:textColor="@color/main_text_color"
                android:textColor="#444444"
                android:textSize="16sp" />

            <View
                android:layout_width="25dp"
                android:layout_width="50dp"
                android:layout_height="1dp"
                android:layout_gravity="center_vertical"
                android:background="@color/main_text_color" />
                android:background="#444444"></View>
        </LinearLayout>

        <com.wpc.library.widget.MyGridView
@@ -78,29 +74,25 @@
            android:orientation="horizontal">

            <View
                android:layout_width="25dp"
                android:layout_width="50dp"
                android:layout_height="1dp"
                android:layout_gravity="center_vertical"
                android:background="@color/main_text_color" />
                android:background="#444444"></View>

            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:layout_marginLeft="12dp"
                android:layout_marginRight="12dp"
                android:drawableLeft="@drawable/ic_des_recommend_top"
                android:drawablePadding="12dp"
                android:layout_gravity="center_vertical|center"
                android:layout_marginLeft="6.5dp"
                android:layout_marginRight="6.5dp"
                android:gravity="center"
                android:text="相关推荐"
                android:textColor="@color/main_text_color"
                android:textColor="#444444"
                android:textSize="16sp" />

            <View
                android:layout_width="25dp"
                android:layout_width="50dp"
                android:layout_height="1dp"
                android:layout_gravity="center_vertical"
                android:background="@color/main_text_color" />
                android:background="#444444"></View>
        </LinearLayout>

        <com.wpc.library.widget.MyGridView
@@ -123,7 +115,7 @@
        android:layout_gravity="center"
        android:layout_marginTop="8dp"
        android:gravity="center"
        android:text="-到底了*^_^*-"
        android:text="@string/list_no_more"
        android:textColor="@color/black"
        android:textSize="14sp" />
</LinearLayout>

 MDShopping/src/main/res/layout/item_goods_detail_bottom.xml

@@ -205,7 +205,7 @@
            android:paddingRight="8dp"
            android:paddingBottom="2dp"
            android:text=""
            android:textColor="#ffe5005c"
            android:textColor="@color/theme"
            android:textSize="10sp"></TextView>

        <LinearLayout

 MDShopping/src/main/res/layout/item_goods_detail_topright_jump.xml

@@ -16,6 +16,6 @@
        android:gravity="center_vertical|left"
        android:text="综合排序"
        android:drawablePadding="10dp"
        android:textColor="@color/main_text_color"
        android:textColor="@color/theme"
        android:textSize="14sp" />
</LinearLayout>

 MDShopping/src/main/res/layout/item_message_top.xml

@@ -6,6 +6,7 @@


    <LinearLayout
        android:visibility="gone"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="center_vertical"

 MDShopping/src/main/res/layout/item_message_welcome.xml

@@ -41,6 +41,7 @@
        android:background="@color/trends_goods_bg" />

    <LinearLayout
        android:visibility="gone"
        android:id="@+id/ll_novice"
        android:layout_width="match_parent"
        android:layout_height="45dp"
@@ -76,6 +77,7 @@
        android:background="@color/trends_goods_bg" />

    <LinearLayout
        android:visibility="gone"
        android:id="@+id/ll_help_center"
        android:layout_width="match_parent"
        android:layout_height="45dp"

 MDShopping/src/main/res/layout/item_order_filter_drop_down.xml

@@ -496,7 +496,7 @@
            android:background="@drawable/shape_search_filter_left"
            android:gravity="center"
            android:text="重置"
            android:textColor="@color/white"
            android:textColor="@color/theme"
            android:textSize="16sp" />

        <TextView

 MDShopping/src/main/res/layout/item_order_filter_top.xml

@@ -34,7 +34,7 @@
                    android:layout_gravity="center"
                    android:gravity="center"
                    android:text="有效订单"
                    android:textColor="@color/main_text_color"
                    android:textColor="@color/theme"
                    android:textSize="15sp" />

                <TextView
@@ -43,7 +43,7 @@
                    android:layout_height="wrap_content"
                    android:layout_gravity="center"
                    android:gravity="center"
                    android:textColor="@color/main_text_color"
                    android:textColor="@color/theme"
                    android:textSize="17sp" />

            </LinearLayout>
@@ -53,7 +53,7 @@
                android:layout_width="55dp"
                android:layout_height="2dp"
                android:layout_gravity="bottom|center_horizontal"
                android:background="@color/main_text_color" />
                android:background="@color/theme" />
        </FrameLayout>

        <View
@@ -105,7 +105,7 @@
                android:layout_width="55dp"
                android:layout_height="2dp"
                android:layout_gravity="bottom|center_horizontal"
                android:background="@color/main_text_color"
                android:background="@color/theme"
                android:visibility="invisible" />
        </FrameLayout>


 MDShopping/src/main/res/layout/item_price_section.xml

@@ -102,6 +102,7 @@
        android:orientation="horizontal">

        <EditText
            android:textCursorDrawable="@drawable/shape_input_cursor"
            android:id="@+id/et_min_price"
            android:layout_width="0dp"
            android:layout_height="28dp"
@@ -127,6 +128,7 @@
            android:gravity="center" />

        <EditText
            android:textCursorDrawable="@drawable/shape_input_cursor"
            android:id="@+id/et_max_price"
            android:layout_width="0dp"
            android:layout_height="28dp"

 MDShopping/src/main/res/layout/item_search_bar.xml

@@ -50,6 +50,7 @@
                    android:layout_marginLeft="5dp">

                    <AutoCompleteTextView
                        android:textCursorDrawable="@drawable/shape_input_cursor"
                        android:id="@+id/et_search_result"
                        android:layout_width="match_parent"
                        android:layout_height="35dp"
@@ -290,6 +291,7 @@
                android:orientation="horizontal">

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:id="@+id/et_low_price"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
@@ -338,6 +340,7 @@
            android:orientation="horizontal">

            <EditText
                android:textCursorDrawable="@drawable/shape_input_cursor"
                android:id="@+id/et_high_price"
                android:layout_width="0dp"
                android:layout_height="wrap_content"

 MDShopping/src/main/res/layout/item_search_flter_condition.xml

@@ -208,6 +208,7 @@
                android:orientation="horizontal">

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:id="@+id/et_low_price"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
@@ -250,6 +251,7 @@
                android:orientation="horizontal">

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:id="@+id/et_high_price"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"

 MDShopping/src/main/res/layout/item_search_result_bar.xml

@@ -189,6 +189,7 @@
                android:orientation="horizontal">

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:id="@+id/et_low_price"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
@@ -237,6 +238,7 @@
            android:orientation="horizontal">

            <EditText
                android:textCursorDrawable="@drawable/shape_input_cursor"
                android:id="@+id/et_high_price"
                android:layout_width="0dp"
                android:layout_height="wrap_content"

 MDShopping/src/main/res/layout/item_search_result_bar_vip.xml

@@ -121,6 +121,7 @@
                android:orientation="horizontal">

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:id="@+id/et_low_price_vip"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
@@ -169,6 +170,7 @@
            android:orientation="horizontal">

            <EditText
                android:textCursorDrawable="@drawable/shape_input_cursor"
                android:id="@+id/et_high_price_vip"
                android:layout_width="0dp"
                android:layout_height="wrap_content"

 MDShopping/src/main/res/layout/item_search_result_goods.xml

@@ -189,7 +189,8 @@
                        android:paddingRight="4dp"
                        android:paddingBottom="3dp"
                        android:text="券"
                        android:textColor="@color/white"
                        android:textColor="@color/theme"
                        android:layout_marginRight="-1dp"
                        android:textSize="12sp" />

                    <TextView

 MDShopping/src/main/res/layout/item_share_from.xml

@@ -15,6 +15,6 @@
        android:drawablePadding="10dp"
        android:gravity="center_vertical|left"
        android:text="综合排序"
        android:textColor="@color/main_text_color"
        android:textColor="@color/theme"
        android:textSize="14sp" />
</LinearLayout>

 MDShopping/src/main/res/layout/item_team_filter_drop_down.xml

@@ -518,6 +518,7 @@
                android:orientation="horizontal">

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:inputType="number"
                    android:id="@+id/et_fans_start"
                    android:layout_width="0dp"
@@ -539,6 +540,7 @@
                    android:background="@color/gray6" />

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:inputType="number"
                    android:id="@+id/et_fans_end"
                    android:layout_width="0dp"
@@ -664,6 +666,7 @@
                android:orientation="horizontal">

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:inputType="number"
                    android:id="@+id/et_money_start"
                    android:layout_width="0dp"
@@ -685,6 +688,7 @@
                    android:background="@color/gray6" />

                <EditText
                    android:textCursorDrawable="@drawable/shape_input_cursor"
                    android:inputType="number"
                    android:id="@+id/et_money_end"
                    android:layout_width="0dp"

 MDShopping/src/main/res/layout/item_trends.xml

@@ -215,7 +215,7 @@
                android:paddingRight="8dp"
                android:paddingBottom="1dp"
                android:text="进店"
                android:textColor="@color/main_text_color" />
                android:textColor="@color/theme" />
        </LinearLayout>
    </LinearLayout>
</LinearLayout>

 MDShopping/src/main/res/layout/item_web_top_right.xml

@@ -7,12 +7,14 @@
    <ImageView
        android:id="@+id/iv_img_left"
        android:layout_width="20dp"
        android:visibility="gone"
        android:layout_height="20dp"
        android:layout_gravity="center_vertical"
        android:layout_marginLeft="20dp"
        android:layout_marginRight="10dp" />

    <TextView
        android:layout_marginLeft="20dp"
        android:id="@+id/tv_content"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@@ -22,6 +24,6 @@
        android:drawablePadding="10dp"
        android:gravity="center_vertical|left"
        android:text="综合排序"
        android:textColor="@color/main_text_color"
        android:textColor="@color/theme"
        android:textSize="14sp" />
</LinearLayout>

 MDShopping/src/main/res/layout/layout_dialog.xml

@@ -15,7 +15,7 @@
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:visibility="visible"
        app:indicatorColor="@color/red"
        app:indicatorColor="@color/theme"
        app:indicatorName="BallPulseIndicator" />

</FrameLayout>

 MDShopping/src/main/res/layout/sellwellgoods.xml

@@ -42,7 +42,7 @@
                    android:layout_centerInParent="true"
                    android:gravity="center"
                    android:text="实时"
                    android:textColor="@color/main_text_color"
                    android:textColor="@color/theme"
                    android:textSize="17sp" />

                <View
@@ -51,7 +51,7 @@
                    android:layout_height="2dp"
                    android:layout_alignParentBottom="true"
                    android:layout_centerHorizontal="true"
                    android:background="@color/main_text_color" />
                    android:background="@color/theme" />
            </RelativeLayout>
            <!--今日-->
            <RelativeLayout
@@ -75,7 +75,7 @@
                    android:layout_height="2dp"
                    android:layout_alignParentBottom="true"
                    android:layout_centerHorizontal="true"
                    android:background="@color/main_text_color"
                    android:background="@color/theme"
                    android:visibility="gone" />
            </RelativeLayout>
            <!--热销-->
@@ -100,7 +100,7 @@
                    android:layout_height="2dp"
                    android:layout_alignParentBottom="true"
                    android:layout_centerHorizontal="true"
                    android:background="@color/main_text_color"
                    android:background="@color/theme"
                    android:visibility="gone" />
            </RelativeLayout>
        </LinearLayout>

 MDShopping/src/main/res/layout/video_review_popupwindow.xml

@@ -13,6 +13,7 @@
        android:padding="10dp">

        <EditText
            android:textCursorDrawable="@drawable/shape_input_cursor"
            android:id="@+id/tv_review_edit"
            android:layout_width="0dp"
            android:layout_height="match_parent"

 MDShopping/src/main/res/mipmap-hdpi/ic_launcher.png

 MDShopping/src/main/res/mipmap-mdpi/ic_launcher.png

 MDShopping/src/main/res/mipmap-xhdpi/ic_grade_down.png

 MDShopping/src/main/res/mipmap-xhdpi/ic_launcher.png

 MDShopping/src/main/res/mipmap-xhdpi/ic_sort_ascending.png

 MDShopping/src/main/res/mipmap-xxhdpi/ic_launcher.png

 MDShopping/src/main/res/mipmap-xxxhdpi/ic_launcher.png

 MDShopping/src/main/res/values/strings.xml

@@ -49,6 +49,10 @@
    <string name="mipush_appid">5f043151570df3228600014a</string>
    <string name="mipush_appkey">5f043151570df3228600014a</string>
    <string name="update_key">a3f390d88e4c41f2747bfa2f1b5f87db</string>
    <string name="list_no_more">-没有更多了额-</string>





</resources>

 social_sdk_library_project/res/layout/umeng_socialize_share.xml

@@ -52,6 +52,7 @@
    </RelativeLayout>

    <EditText

        android:id="@+id/umeng_socialize_share_edittext"
        android:layout_width="fill_parent"
        android:layout_height="180dp"

 social_sdk_library_project/res/layout/vk_share_dialog.xml

@@ -106,6 +106,7 @@
                android:paddingTop="@dimen/vk_share_dialog_padding_top">

                <EditText

                    android:id="@+id/shareText"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"