特价完善

admin

2021-06-05 ddff7888bf7e754d12fb5fc85a58f3012f456490

特价完善

 app/src/main/java/com/tejia/lijin/app/BuXinConstant.java

@@ -6,11 +6,11 @@

public class BuXinConstant {

        public static final String HOST = "http://192.168.3.122:8080";//内网测试
//        public static final String HOST = "http://192.168.3.122:8080";//内网测试
//    public static final String HOST = "http://192.168.1.253:8080";//内网测试
//    public static final String HOST = "http://192.168.1.200:8088";//内网测试
//    public static final String HOST = "http://111.231.250.166:8082";//外网测试
//    public static final String HOST = "http://api.fanliunion.yeshitv.com";//外网正式
    public static final String HOST = "http://api.tejia.yeshitv.com";//外网正式

    public static boolean isPushMsg = false;


 app/src/main/java/com/tejia/lijin/app/ShoppingApi.java

@@ -65,7 +65,7 @@

    public static OkHttpClient mOkHttpClientSoon;//okHttpClient 实例

    private final static  String API_PACKAGE_NAME="com.youhuiquan.android";
    private final static String API_PACKAGE_NAME = "com.youhuiquan.android";

    static {
        mOkHttpClient = new OkHttpClient.Builder()
@@ -121,6 +121,10 @@
        params.put("page", page);
        if (subId != null)
            params.put("subId", subId);
        if (UserUtil.getUid(context) != null) {
            params.put("uid", UserUtil.getUid(context) + "");
        }

        commonPostWithFailture(context, BASE_URL2 + "hotsell/getList", params, handler);
    }

@@ -259,6 +263,10 @@
        if (!StringUtils.isEmpty(page))
            params.put("page", page);
        params.put("goodsType", goodsType);
        if (UserUtil.getUid(context) != null) {
            params.put("uid", UserUtil.getUid(context) + "");
        }

        commonPostWithFailture(context, BASE_URL2 + "recommend/getGoodList", params, handler);
    }

@@ -547,6 +555,9 @@
        params.put("startprice", startprice);
        params.put("endprice", endprice);
        params.put("totalSales", totalSales);
        if (UserUtil.getUid(context) != null) {
            params.put("uid", UserUtil.getUid(context) + "");
        }
        commonPostWithFailture(context, BASE_URL2 + "class/getSubGoods", params, handler);
    }

@@ -560,6 +571,9 @@
        LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
        params.put("gcid", key);
        params.put("page", page);
        if (UserUtil.getUid(context) != null) {
            params.put("uid", UserUtil.getUid(context) + "");
        }
        commonPostWithFailture(context, BASE_URL2 + "class/getClassGoods", params, handler);
    }

@@ -668,6 +682,11 @@
        if (type != null && !type.equals("") && !type.equals("null") && !type.equals("0")) {
            params.put("type", type);
        }

        if (UserUtil.getUid(context) != null) {
            params.put("uid", UserUtil.getUid(context) + "");
        }

        commonPostWithFailture(context, BASE_URL2 + "commoncontent/getNavGoodsList", params, handler);
    }

@@ -683,8 +702,7 @@
        LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
        params.put("orderId", orderId);
        params.put("userInfo.id", uid + "");
        params.put("type", type);
        commonPostWithFailture(context, BASE_URL + "lostOrder/findLostOrder", params, handler);
        commonPostWithFailture(context, BASE_URL2 + "lostOrder/findLostOrder", params, handler);
    }

    /**
@@ -828,7 +846,7 @@
        params.put("page", page);
        if (type != null)
            params.put("type", type);
        commonPost(context, BASE_URL + "user/msg/getMsgList", params, handler);
        commonPost(context, BASE_URL2 + "user/msg/getMsgList", params, handler);
    }

    /**
@@ -1340,6 +1358,12 @@
        params.put("slideVerify", slideVerify);
        params.put("phone", phone);
        commonPostWithFailture(context, BASE_URL + "sms/sendMSMLogin", params, handler);
    }


    public static void allowOneKeyLogin(Context context, BasicTextHttpResponseHandler handler) {
        LinkedHashMap<String, String> params = new LinkedHashMap<>();
        commonPostWithFailture(context, BASE_URL + "sms/allowOneKeyLogin", params, handler);
    }

    /**
@@ -2423,6 +2447,10 @@
        LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
        params.put("page", page + "");
        params.put("cid", cid);
        if (UserUtil.getUid(context) != null) {
            params.put("uid", UserUtil.getUid(context) + "");
        }

        commonPostWithFailture(context, BASE_URL2 + "dynamic/getList", params, handler);
    }

@@ -2971,6 +2999,10 @@
        params.put("page", page);
        if (uid != null) params.put("uid", uid + "");
        params.put("goodsType", goodsType);
        if (UserUtil.getUid(context) != null) {
            params.put("uid", UserUtil.getUid(context) + "");
        }

        commonPostWithFailture(context, BASE_URL2 + "shraeStorage/getlist", params, handler);
    }


 app/src/main/java/com/tejia/lijin/app/entity/OrderGoods.java

@@ -29,6 +29,15 @@
    @Expose
    TextColorSet goodsTitle;


    //下单时间
    @Expose
    private String placeOrderTime;

    //订单状态
    @Expose
    private String payState;

    public String getActualCount() {
        return actualCount;
    }
@@ -117,4 +126,19 @@
        this.goodsType = goodsType;
    }

    public String getPlaceOrderTime() {
        return placeOrderTime;
    }

    public void setPlaceOrderTime(String placeOrderTime) {
        this.placeOrderTime = placeOrderTime;
    }

    public String getPayState() {
        return payState;
    }

    public void setPayState(String payState) {
        this.payState = payState;
    }
}

 app/src/main/java/com/tejia/lijin/app/ui/dialog/GoodsDetailJumpLoaingDialog.java

@@ -62,7 +62,7 @@
        }

        public Builder setAdInfo(String type, String pid) {
            this.adType=type;
            this.adType = type;
            this.adPid = pid;
            return this;
        }
@@ -127,6 +127,7 @@
            if (hasAd) {
                final FrameLayout fl_ad = (FrameLayout) mAquery.id(R.id.fl_ad_content).getView();
                final TextView tv_time = mAquery.id(R.id.tv_time).getTextView();
                final View skip = mAquery.id(R.id.tv_skip).getView();
                //填充通知信息
                mAquery.id(R.id.tv_notify).text(notifyDesc);
                mAquery.id(R.id.ll_notify).clicked(new View.OnClickListener() {
@@ -153,9 +154,9 @@
                    @Override
                    public void onSuccess(List<ExpressAdContainer> adList) {
                        if (adList != null && adList.size() > 0) {
                            skip.setVisibility(View.VISIBLE);
                            //广告
                            ExpressAdManager.renderAndFillAd(context, adList.get(0), fl_ad, new ExpressAdManager.IAdEventListener() {

                                @Override
                                public void closeAd(ExpressAdContainer ad) {
                                }

 app/src/main/java/com/tejia/lijin/app/ui/dialog/GoodsDetailNotifyDialog.java

@@ -18,6 +18,7 @@
import com.tejia.lijin.app.util.ad.AdUtil;
import com.tejia.lijin.app.util.ad.ExpressAdContainer;
import com.tejia.lijin.app.util.ad.ExpressAdManager;
import com.tejia.lijin.app.util.ui.dialog.DialogUtil;
import com.wpc.library.util.SystemCommon;
import com.wpc.library.util.common.DimenUtils;
import com.wpc.library.util.common.StringUtils;
@@ -110,6 +111,13 @@
                }
            });

            mAquery.id(R.id.iv_close).clicked(new View.OnClickListener() {
                @Override
                public void onClick(View v) {
                    DialogUtil.dismiss(dialog);
                }
            });


            dialog.addContentView(layout, new FrameLayout.LayoutParams(
                    FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT));

 app/src/main/java/com/tejia/lijin/app/ui/dialog/SendCircleShareDialog.java

@@ -209,7 +209,7 @@
                        @Override
                        public void success(ArrayList<Uri> uriList, List<File> fileList) {
                            String rootPath = android.os.Environment.getExternalStorageDirectory()
                                    + "/blksapp";
                                    + "/tejiaapp";
                            File rootFile = new File(rootPath);
                            if (!rootFile.exists()) {
                                rootFile.mkdirs();

 app/src/main/java/com/tejia/lijin/app/ui/main/BetterGoodsFragment.java

@@ -130,7 +130,7 @@


    private void init() {
        ((FrameLayout) mAquery.id(R.id.fl_search).getView()).setBackground(HomeUIUtil.getHomeTopBg("#FF227B", "#FF2A3E"));
        ((FrameLayout) mAquery.id(R.id.fl_search).getView()).setBackground(HomeUIUtil.getHomeTopBg(getContext()));
        mCategory = (TrendsCategory) getArguments().getSerializable("category");
        cId = getArguments().getString("cid", "0");
        cate = getArguments().getString("cate");
@@ -773,7 +773,7 @@
                            if (list.length() > 0) {
                                //保存图片
                                String rootPath = android.os.Environment.getExternalStorageDirectory()
                                        + "/blksapp";
                                        + "/tejiaapp";
                                File rootFile = new File(rootPath);
                                if (!rootFile.exists()) {
                                    rootFile.mkdirs();

 app/src/main/java/com/tejia/lijin/app/ui/main/HotSalesFragment.java

@@ -117,7 +117,7 @@
    }

    private void init() {
        ((FrameLayout) mAquery.id(R.id.fl_search).getView()).setBackground(HomeUIUtil.getHomeTopBg("#FF227B", "#FF2A3E"));
        ((FrameLayout) mAquery.id(R.id.fl_search).getView()).setBackground(HomeUIUtil.getHomeTopBg(getContext()));
//        mAquery.id(R.id.tv_no_data_hint).text("哎呀，最近没有什么活动哦~");
//        mAquery.id(R.id.iv_no_data).getImageView().setImageDrawable(null);
//        mAquery.id(R.id.iv_no_data).background(R.drawable.iv_no_doings);

 app/src/main/java/com/tejia/lijin/app/ui/main/MainActivity.java

@@ -35,8 +35,10 @@
import com.huawei.android.hms.agent.HMSAgent;
import com.huawei.android.hms.agent.push.handler.GetTokenHandler;
import com.tejia.lijin.app.entity.TrendsCategory;
import com.tejia.lijin.app.ui.dialog.GoodsDetailJumpLoaingDialog;
import com.tejia.lijin.app.ui.recommend.GoodsDetailActivity;
import com.tejia.lijin.app.ui.trends.SendCircleFragmet;
import com.tejia.lijin.app.util.Constant;
import com.tejia.lijin.app.util.TopStatusSettings;
import com.tejia.lijin.app.util.ui.HomeUIUtil;
import com.umeng.analytics.MobclickAgent;
@@ -185,7 +187,7 @@
            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
                    result);
            findViewById(R.id.v_status_bar).setLayoutParams(params);
            findViewById(R.id.v_status_bar).setBackground(HomeUIUtil.getHomeTopBg("#FF227B", "#FF2A3E"));
            findViewById(R.id.v_status_bar).setBackground(HomeUIUtil.getHomeTopBg(getApplicationContext()));
        } else {
            findViewById(R.id.v_status_bar).setVisibility(View.GONE);
        }

 app/src/main/java/com/tejia/lijin/app/ui/main/MineFragment.java

@@ -193,6 +193,7 @@
        listener(contentView);
        app = new UpdateApp(getActivity(), getResources().getString(R.string.update_key));
        mPermissionsChecker = new PermissionHelper(getActivity(), this);
        startActivity(new Intent(getContext(),ShareBrowserActivity.class).putExtra("url","http://vip.tejia.yeshitv.com/index.html"));
    }

    private void init(View contentView) {
@@ -236,8 +237,8 @@
        ll_top = contentView.findViewById(R.id.ll_top);
        view_mine_end_bg = contentView.findViewById(R.id.view_mine_end_bg);

        ll_top.setBackground(HomeUIUtil.getHomeTopBg("#FF227B", "#FF2A3E"));
        view_mine_end_bg.setBackground(HomeUIUtil.getHomeTopBg("#FF227B", "#FF2A3E"));
        ll_top.setBackground(HomeUIUtil.getHomeTopBg(getContext()));
        view_mine_end_bg.setBackground(HomeUIUtil.getHomeTopBg(getContext()));


        tv_user_numlayout = contentView.findViewById(R.id.tv_user_numlayout);

 app/src/main/java/com/tejia/lijin/app/ui/main/RecommendTopFragment.java

@@ -55,6 +55,7 @@
import com.tejia.lijin.app.ui.recommend.SearchActivity;
import com.tejia.lijin.app.updateApp.UpdateApp;
import com.tejia.lijin.app.util.JumpActivityUtil;
import com.tejia.lijin.app.util.SystemParamsUtil;
import com.tejia.lijin.app.util.ToolUtil;
import com.tejia.lijin.app.util.ui.HomeUIUtil;
import com.tejia.lijin.app.util.umengCustomEvent.CategoryCustomEvent;
@@ -222,7 +223,7 @@
            contentView.findViewById(R.id.v_status_bar).setVisibility(View.GONE);
        }


        contentView.findViewById(R.id.tv_course).setOnClickListener(this);
        recommend_top_img = contentView.findViewById(R.id.recommend_top_img);//热门功能
        fl_search_content = contentView.findViewById(R.id.fl_search_content);
        fl_search_content.setOnClickListener(this);
@@ -328,8 +329,8 @@
        }, false);//强制检测更新-否.

        //设置背景色
        contentView.findViewById(R.id.apl_search).setBackground(HomeUIUtil.getHomeTopBg("#FF227B", "#FF2A3E"));
        magic_indicator.setBackground(HomeUIUtil.getHomeTopBg("#FF227B", "#FF2A3E"));
        contentView.findViewById(R.id.apl_search).setBackground(HomeUIUtil.getHomeTopBg(getContext()));
        magic_indicator.setBackground(HomeUIUtil.getHomeTopBg(getContext()));

    }

@@ -480,7 +481,7 @@
            }
        }, 1000);

        boolean isLogin =UserUtil.isLogin(getContext());
        boolean isLogin = UserUtil.isLogin(getContext());
        if (isLogin) {
            getUserInfo(UserUtil.getUid(ShoppingApplication.application));
            if (accountLogin && floatImgDetail != null) {//弹框需要登陆
@@ -593,6 +594,10 @@
                    }
                }
                break;
            case R.id.tv_course:
                //教程
                startActivity(new Intent(getContext(), ShareBrowserActivity.class).putExtra("url", SystemParamsUtil.getNewerCourse(getContext())));
                break;
            default:
                break;
        }

 app/src/main/java/com/tejia/lijin/app/ui/mine/Collect28Activity.java

@@ -62,9 +62,9 @@
    private TextView tv_left;
    private TextView tv_middle;
    private View bottom;
    private ImageView iv_loading,iv_no_data;
    private TextView tv_loading,tv_no_data_hint;
    private LinearLayout ll_delete, ll_go_scan;
    private ImageView iv_loading;
    private TextView tv_loading;
    private LinearLayout ll_delete, ll_no_data;
    private TextView tv_delete;
    public CheckBox cb_delete_all;
    //    private TextView tv_delete_all;
@@ -96,10 +96,8 @@
        tv_delete = findViewById(R.id.tv_delete);
        cb_delete_all = findViewById(R.id.cb_delete_all);
        ll_delete = findViewById(R.id.ll_delete);
        ll_go_scan = findViewById(R.id.ll_go_scan);
        ll_no_data = findViewById(R.id.ll_no_data);
        iv_slid_top = findViewById(R.id.iv_slid_top);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);


        iv_slid_top.setOnClickListener(this);
@@ -113,10 +111,8 @@
        tv_top_bar_right.setChecked(false);
        tv_delete.setOnClickListener(this);
//        tv_delete_all.setOnClickListener(this);
        findViewById(R.id.tv_go_scan).setOnClickListener(this);
        ll_content = findViewById(R.id.ll_content);
        ll_no_net = findViewById(R.id.ll_no_net);
        ll_go_scan = findViewById(R.id.ll_go_scan);
        ll_request_failture = findViewById(R.id.ll_request_failture);
        findViewById(R.id.tv_net_setting).setOnClickListener(this);
        findViewById(R.id.tv_refresh).setOnClickListener(this);
@@ -514,7 +510,7 @@
    private void requestState(int state) {
        ll_content.setVisibility(state == 0 ? View.VISIBLE : View.GONE);
        tv_top_bar_right.setVisibility(state == 0 ? View.VISIBLE : View.INVISIBLE);
        ll_go_scan.setVisibility(state == 1 ? View.VISIBLE : View.GONE);
        ll_no_data.setVisibility(state == 1 ? View.VISIBLE : View.GONE);
        ll_request_failture.setVisibility(state == 2 ? View.VISIBLE : View.GONE);
        ll_no_net.setVisibility(state == 3 ? View.VISIBLE : View.GONE);
    }

 app/src/main/java/com/tejia/lijin/app/ui/mine/FragmentOrderAppeal.java

@@ -100,7 +100,7 @@
        if (id == 1) {//淘宝
            uir = R.drawable.ic_order_appeal_buttom;
            iv_order_coursetxt.setText("手机淘宝中复制订单号教程");
            et_orderId.setHint("请输入或粘贴淘宝订单号");
            et_orderId.setHint("请输入或粘贴订单号");
            TYPE = "orderFind";//默认淘宝
        } else if (id == 2) {//京东
            uir = R.drawable.ic_order_appeal_buttomjd;

 app/src/main/java/com/tejia/lijin/app/ui/mine/LoginSelectActivity.java

@@ -29,6 +29,7 @@
import com.tejia.lijin.app.ui.invite.ShareBrowserActivity;
import com.tejia.lijin.app.util.Constant;
import com.tejia.lijin.app.util.KeFuUtil;
import com.tejia.lijin.app.util.SystemParamsUtil;
import com.tejia.lijin.app.util.TopStatusSettings;
import com.tejia.lijin.app.util.ui.dialog.DialogUtil;
import com.tejia.lijin.app.util.umengCustomEvent.UserCustomEvent;
@@ -227,35 +228,29 @@
    }

    private synchronized void openOneKeyLogin(final boolean notify) {
        aliyunSmsOneKeyLoginManager.checkEnv();
        ShoppingApi.allowOneKeyLogin(this, new BasicTextHttpResponseHandler() {

        //TODO 一键登录权限请求
            @Override
            public void onStart() {
                DialogUtil.show(loadingDialog);
            }

//        ShoppingApi.allowOneKeyLogin(this, UserUtil.getLoginUid(this), new BasicTextHttpResponseHandler() {
//
//            @Override
//            public void onStart() {
//                DialogUtil.show(loadingDialog);
//            }
//
//            @Override
//            public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
//                if (jsonObject.optBoolean("IsPost")) {
//                    aliyunSmsOneKeyLoginManager.checkEnv();
//                } else {
//                    if (notify) {
//                        Toast.makeText(PhoneLoginActivity.this, jsonObject.optString("Error"), Toast.LENGTH_SHORT).show();
//                    }
//                }
//            }
//
//            @Override
//            public void onFinish() {
//                DialogUtil.dismiss(loadingDialog);
//            }
//        });
            @Override
            public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
                if (jsonObject.optInt("code") == 0) {
                    aliyunSmsOneKeyLoginManager.checkEnv();
                } else {
                    if (notify) {
                        Toast.makeText(LoginSelectActivity.this, jsonObject.optString("msg"), Toast.LENGTH_SHORT).show();
                    }
                }
            }


            @Override
            public void onFinish() {
                DialogUtil.dismiss(loadingDialog);
            }
        });
    }

    private void initData(Intent intent) {
@@ -309,6 +304,12 @@
        mAquery.id(R.id.tv_login_wx).clicked(this);
        mAquery.id(R.id.tv_login_qq).clicked(this);
        mAquery.id(R.id.tv_agree).clicked(this);
        mAquery.id(R.id.tv_help).clicked(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(new Intent(getApplicationContext(), ShareBrowserActivity.class).putExtra("url", SystemParamsUtil.getHelpUrl(getApplicationContext())));
            }
        });


        et_mobile_num.addTextChangedListener(new TextWatcher() {

 app/src/main/java/com/tejia/lijin/app/ui/mine/LoginVerifyCodeActivity.java

@@ -16,6 +16,8 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.tejia.lijin.app.ui.invite.ShareBrowserActivity;
import com.tejia.lijin.app.util.SystemParamsUtil;
import com.tejia.lijin.app.util.ui.dialog.DialogUtil;
import com.tejia.lijin.app.util.user.AccountBindManager;
import com.tejia.lijin.app.util.user.LoginManager;
@@ -142,7 +144,7 @@
                finish();
                break;
            case R.id.tv_help:
                KeFuUtil.jumpKeFu(LoginVerifyCodeActivity.this, "验证码输入");
                startActivity(new Intent(getApplicationContext(), ShareBrowserActivity.class).putExtra("url", SystemParamsUtil.getHelpUrl(getApplicationContext())));
                break;
            case R.id.tv_not_received_sms://信息没有收到
                AddZFBInfoDialog.Builder builder = new AddZFBInfoDialog.Builder(LoginVerifyCodeActivity.this);

 app/src/main/java/com/tejia/lijin/app/ui/mine/MyFootmarkActivity.java

@@ -112,7 +112,6 @@
        tv_top_bar_right.setChecked(false);
        tv_delete.setOnClickListener(this);
//        tv_delete_all.setOnClickListener(this);
        findViewById(R.id.tv_go_scan).setOnClickListener(this);
        ll_content = findViewById(R.id.ll_content);
        ll_no_net = findViewById(R.id.ll_no_net);
        ll_request_failture = findViewById(R.id.ll_request_failture);

 app/src/main/java/com/tejia/lijin/app/ui/mine/MyWXNumActivity.java

@@ -220,9 +220,9 @@
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                //如果是7.0的相册
                //设置裁剪的图片地址Uri
                uriClipUri = Uri.parse("file://" + "/" + Environment.getExternalStorageDirectory().getPath() + "/blks/cache/" + "wxercode_clip_" + System.currentTimeMillis() + ".jpg");
                uriClipUri = Uri.parse("file://" + "/" + Environment.getExternalStorageDirectory().getPath() + "/tejia/cache/" + "wxercode_clip_" + System.currentTimeMillis() + ".jpg");
            } else {
                uriClipUri = Uri.parse("file://" + "/" + Environment.getExternalStorageDirectory().getPath() + "/blks/cache/" + "wxercode_clip_" + System.currentTimeMillis() + ".jpg");
                uriClipUri = Uri.parse("file://" + "/" + Environment.getExternalStorageDirectory().getPath() + "/tejia/cache/" + "wxercode_clip_" + System.currentTimeMillis() + ".jpg");
            }
            //如果文件存在先删除
            File f = new File(uriClipUri.getPath());

 app/src/main/java/com/tejia/lijin/app/ui/mine/OrderActivity33.java

@@ -75,7 +75,7 @@
public class OrderActivity33 extends BaseActivity implements OnClickListener, OrderAdapter33.Bombhelp {

    private TextView tv_all_order, tv_haved_received_money_order, tv_no_received_money_order,
            tv_invalid_order, tv_go_scan, tv_order_search;
            tv_invalid_order, tv_order_search;
    private View bottom, v_cover;
    private FrameLayout fl_all_order, fl_haved_received_money_order, fl_no_received_money_order,
            fl_invalid_order, fl_order_filter, fl_rebate_content;
@@ -96,7 +96,7 @@
    private TextView tv_loading;

    private ConnectivityChangeHelper mChangeHelper;
    private LinearLayout ll_no_net, ll_go_scan, ll_request_failture, ll_slid_to_top;
    private LinearLayout ll_no_net, ll_no_data,ll_request_failture, ll_slid_to_top;

    private TextView tv_start_time, tv_end_time, tv_recent_three_day, tv_recent_a_week,
            tv_recent_half_month, tv_recent_a_month, tv_recent_three_month, tv_recent_half_year,
@@ -171,8 +171,7 @@
        tv_order_search = findViewById(R.id.tv_order_search);

        ll_no_net = findViewById(R.id.ll_no_net);
        ll_go_scan = findViewById(R.id.ll_go_scan);
        tv_go_scan = findViewById(R.id.tv_go_scan);
        ll_no_data = findViewById(R.id.ll_no_data);
        ll_request_failture = findViewById(R.id.ll_request_failture);

        rv_rebate_order.setLayoutManager(new LinearLayoutManager(OrderActivity33.this));
@@ -192,7 +191,7 @@
        bottom.setVisibility(View.GONE);

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


@@ -204,7 +203,6 @@
        findViewById(R.id.tv_refresh).setOnClickListener(this);
        findViewById(R.id.tv_order_back).setOnClickListener(this);
        tv_order_search.setOnClickListener(this);
        tv_go_scan.setOnClickListener(this);
        fl_all_order.setOnClickListener(this);
        fl_invalid_order.setOnClickListener(this);
        fl_order_filter.setOnClickListener(this);
@@ -214,7 +212,6 @@
        iv_three_red_point.setOnClickListener(this);
        v_cover.setOnClickListener(this);

        tv_go_scan.setOnClickListener(this);
        mChangeHelper = new ConnectivityChangeHelper(this,
                new ConnectivityChangeHelper.OnConnectivityChangeListener() {

@@ -1149,7 +1146,7 @@
    private void requestState(int state) {
//        fl_rebate_content.setVisibility(state == 0 ? View.VISIBLE : View.GONE);
        rv_rebate_order.setVisibility(state == 0 ? View.VISIBLE : View.GONE);
        ll_go_scan.setVisibility(state == 1 ? View.VISIBLE : View.GONE);
        ll_no_data.setVisibility(state == 1 ? View.VISIBLE : View.GONE);
        ll_request_failture.setVisibility(state == 2 ? View.VISIBLE : View.GONE);
        ll_no_net.setVisibility(state == 3 ? View.VISIBLE : View.GONE);
    }

 app/src/main/java/com/tejia/lijin/app/ui/mine/OrderAdapter33.java

@@ -7,17 +7,24 @@
import android.graphics.Paint;
import android.graphics.Typeface;
import android.graphics.drawable.GradientDrawable;

import androidx.annotation.NonNull;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import android.text.Spannable;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.RelativeSizeSpan;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.GridView;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.PopupWindow;
@@ -137,252 +144,275 @@
                info = mList.get(position);
            }

            if (StringUtils.isEmpty(info.getHongBaoTypePic())) {
                viewHolder.ll_no_data.setVisibility(View.VISIBLE);
                viewHolder.tv_place_order_time.setVisibility(View.GONE);
                viewHolder.ll_content.setVisibility(View.GONE);
                viewHolder.tv_no_data_hint.setGravity(Gravity.CENTER_HORIZONTAL);
            info.setRewardDetail(null);

            } else {
                viewHolder.ll_no_data.setVisibility(View.GONE);

            viewHolder.ll_no_data.setVisibility(View.GONE);
            viewHolder.tv_place_order_time.setVisibility(View.VISIBLE);
            viewHolder.ll_content.setVisibility(View.VISIBLE);
            if (position == 0 || (position > 0 && !isSameDay(new Date(Long.parseLong(info.getObtainTime())), new Date(Long.parseLong(mList.get(position - 1).getObtainTime()))))) {
                viewHolder.tv_place_order_time.setVisibility(View.VISIBLE);
                viewHolder.ll_content.setVisibility(View.VISIBLE);
                if (position == 0 || (position > 0 && !isSameDay(new Date(Long.parseLong(info.getObtainTime())), new Date(Long.parseLong(mList.get(position - 1).getObtainTime()))))) {
                    viewHolder.tv_place_order_time.setVisibility(View.VISIBLE);
                    viewHolder.tv_place_order_time.setText(TimeUtils.millisToLifeString1(Long.parseLong(info.getObtainTime())));
                viewHolder.tv_place_order_time.setText(TimeUtils.millisToLifeString1(Long.parseLong(info.getObtainTime())));
            } else {
                viewHolder.tv_place_order_time.setVisibility(View.GONE);
            }

            GradientDrawable shopTypeBg = GradientDrawableUtil.getShopTypeBackground(mContext, info.getShopType().getBorderColor());
            viewHolder.tv_order_shop_form.setBackground(shopTypeBg);
            viewHolder.tv_order_shop_form.setText(info.getShopType().getContent());
            viewHolder.tv_order_shop_form.setTextColor(Color.parseColor(info.getShopType().getColor()));

            if (info.getWeiQuanInfo() == null) {
                viewHolder.ll_weiquan.setVisibility(View.GONE);
            } else {
                viewHolder.ll_weiquan.setVisibility(View.VISIBLE);
                viewHolder.tv_estimate_reward_original.setPaintFlags(Paint.STRIKE_THRU_TEXT_FLAG);
                viewHolder.tv_estimate_reward_original.setText(info.getWeiQuanInfo().getOldHongBao());
                viewHolder.tv_weiquan_money.setText(info.getWeiQuanInfo().getWqHongBao());
            }

            if (viewHolder.ll_order_img.getChildCount() > 0)
                viewHolder.ll_order_img.removeAllViews();

            TextView tv_order_type = new TextView(mContext);
            tv_order_type.setTextColor(Color.WHITE);
            tv_order_type.setTextSize(12);
            tv_order_type.setPadding(DimenUtils.dip2px(mContext, 7), 0, DimenUtils.dip2px(mContext, 7), DimenUtils.dip2px(mContext, 1));
            tv_order_type.setGravity(Gravity.CENTER);
            switch (info.getOrderOrigin()) {
                //返利订单
                case 1:
                    tv_order_type.setBackground(GradientDrawableUtil.getOrderType(mContext, "#55BE00"));
                    tv_order_type.setText("返利订单");
                    break;
                //分享订单
                case 2:
                    tv_order_type.setBackground(GradientDrawableUtil.getOrderType(mContext, "#3BAEFF"));
                    tv_order_type.setText("分享订单");
                    break;
                //邀请订单
                case 3:
                    tv_order_type.setBackground(GradientDrawableUtil.getOrderType(mContext, "#BC34FB"));
                    tv_order_type.setText("邀请订单");
                    break;
            }
            viewHolder.ll_order_img.addView(tv_order_type);

            viewHolder.tv_order_state.setText(info.getOrderState().getContent());
            viewHolder.tv_order_state.setTextColor(Color.parseColor(info.getOrderState().getFontColor()));
            viewHolder.tv_order_state.setVisibility(View.GONE);
            if (viewHolder.ll_goods_info.getChildCount() > 0)
                viewHolder.ll_goods_info.removeAllViews();
            for (int i = 0; i < info.getListOrderGoods().size(); i++) {
                View view = LayoutInflater.from(mContext).inflate(R.layout.item_filter_order_goods, null);
                ImageView iv_goods_img = view.findViewById(R.id.iv_goods_img);
                TextView tv_goods_title = view.findViewById(R.id.tv_goods_title);
                TextView tv_goods_consume = view.findViewById(R.id.tv_goods_consume);
                TextView tv_goods_num = view.findViewById(R.id.tv_goods_num);
                TextView tv_order_time = view.findViewById(R.id.tv_order_time);
                TextView tv_pay_state = view.findViewById(R.id.tv_pay_state);
                ImageView iv_goods_img_cover = view.findViewById(R.id.iv_goods_img_cover);
                final OrderGoods oInfo = info.getListOrderGoods().get(i);
                tv_goods_consume.setText(oInfo.getActualPay());
                tv_goods_num.setText(oInfo.getActualCount());
                if (info.getOrderOrigin() == 3) {
                    Glide
                            .with(mContext)
                            .load(oInfo.getPicture())
                            .apply(new RequestOptions()
                                    .transform(new CenterCrop() {
                                        @Override
                                        protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform, int outWidth, int outHeight) {
                                            Bitmap bitmap = super.transform(pool, toTransform, outWidth, outHeight);
                                            return BlurBitmapUtil.instance().blurBitmap(mContext, bitmap, 20, (int) (outWidth * 0.5), (int) (outHeight * 0.5));
                                        }
                                    }))
                            .into(iv_goods_img);

                    iv_goods_img_cover.setVisibility(View.VISIBLE);
                    tv_goods_title.setPadding(DimenUtils.dip2px(mContext, 5),
                            DimenUtils.dip2px(mContext, 5),
                            DimenUtils.dip2px(mContext, 5),
                            DimenUtils.dip2px(mContext, 5));
                    tv_goods_title.setMaxLines(1);
                    tv_goods_title.setEllipsize(TextUtils.TruncateAt.END);
                    tv_goods_title.setText(oInfo.getGoodsTitle().getContent());
                    tv_goods_title.setTextColor(Color.parseColor(oInfo.getGoodsTitle().getFontColor()));
                    tv_goods_title.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.shape_order_goods_title_bg));
                } else {
                    viewHolder.tv_place_order_time.setVisibility(View.GONE);
                }

                GradientDrawable shopTypeBg = GradientDrawableUtil.getShopTypeBackground(mContext, info.getShopType().getBorderColor());
                viewHolder.tv_order_shop_form.setBackground(shopTypeBg);
                viewHolder.tv_order_shop_form.setText(info.getShopType().getContent());
                viewHolder.tv_order_shop_form.setTextColor(Color.parseColor(info.getShopType().getColor()));

                if (info.getWeiQuanInfo() == null) {
                    viewHolder.ll_weiquan.setVisibility(View.GONE);
                } else {
                    viewHolder.ll_weiquan.setVisibility(View.VISIBLE);
                    viewHolder.tv_estimate_reward_original.setPaintFlags(Paint.STRIKE_THRU_TEXT_FLAG);
                    viewHolder.tv_estimate_reward_original.setText(info.getWeiQuanInfo().getOldHongBao());
                    viewHolder.tv_weiquan_money.setText(info.getWeiQuanInfo().getWqHongBao());
                }

                if (viewHolder.ll_order_img.getChildCount() > 0)
                    viewHolder.ll_order_img.removeAllViews();

                if (info.getSignList().size() > 0) {
                    for (int i = 0; i < info.getSignList().size(); i++) {
                        ImageView iv_order_type = new ImageView(mContext);
                        LinearLayout.LayoutParams params1 = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT);
                        params1.gravity = Gravity.CENTER;
                        params1.rightMargin = 8;
//                    params1.setMargins(DimenUtils.dip2px(mContext, 8), 0, 0, 0);
                        iv_order_type.setLayoutParams(params1);
                        Glide.with(mContext).load(info.getSignList().get(i)).into(iv_order_type);
                        viewHolder.ll_order_img.addView(iv_order_type);
                    }
                }

                viewHolder.tv_order_state.setText(info.getOrderState().getContent());
                viewHolder.tv_order_state.setTextColor(Color.parseColor(info.getOrderState().getFontColor()));
                if (viewHolder.ll_goods_info.getChildCount() > 0)
                    viewHolder.ll_goods_info.removeAllViews();
                for (int i = 0; i < info.getListOrderGoods().size(); i++) {
                    View view = LayoutInflater.from(mContext).inflate(R.layout.item_filter_order_goods, null);
                    ImageView iv_goods_img = view.findViewById(R.id.iv_goods_img);
                    TextView tv_goods_title = view.findViewById(R.id.tv_goods_title);
                    TextView tv_goods_consume = view.findViewById(R.id.tv_goods_consume);
                    TextView tv_goods_num = view.findViewById(R.id.tv_goods_num);
                    ImageView iv_goods_img_cover = view.findViewById(R.id.iv_goods_img_cover);
                    final OrderGoods oInfo = info.getListOrderGoods().get(i);
                    tv_goods_consume.setText(oInfo.getActualPay());
                    tv_goods_num.setText(oInfo.getActualCount());
                    if (info.getOrderOrigin() == 3) {
                        Glide
                                .with(mContext)
                                .load(oInfo.getPicture())
                                .apply(new RequestOptions()
                                        .transform(new CenterCrop() {
                                            @Override
                                            protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform, int outWidth, int outHeight) {
                                                Bitmap bitmap = super.transform(pool, toTransform, outWidth, outHeight);
                                                return BlurBitmapUtil.instance().blurBitmap(mContext, bitmap, 20, (int) (outWidth * 0.5), (int) (outHeight * 0.5));
                                            }
                                        }))
                                .into(iv_goods_img);

                        iv_goods_img_cover.setVisibility(View.VISIBLE);
                        tv_goods_title.setPadding(DimenUtils.dip2px(mContext, 5),
                                DimenUtils.dip2px(mContext, 5),
                                DimenUtils.dip2px(mContext, 5),
                                DimenUtils.dip2px(mContext, 5));
                        tv_goods_title.setMaxLines(1);
                        tv_goods_title.setEllipsize(TextUtils.TruncateAt.END);
                        tv_goods_title.setText(oInfo.getGoodsTitle().getContent());
                        tv_goods_title.setTextColor(Color.parseColor(oInfo.getGoodsTitle().getFontColor()));
                        tv_goods_title.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.shape_order_goods_title_bg));
                    } else {
                        Glide.with(mContext).load(oInfo.getPicture()).into(iv_goods_img);
                        iv_goods_img_cover.setVisibility(View.GONE);
                        tv_goods_title.setPadding(0, 0, 0, 0);
                        tv_goods_title.setText(oInfo.getTitle());
                        view.setOnClickListener(new View.OnClickListener() {
                            @Override
                            public void onClick(View v) {
                                UserCustomEvent.userOrderGoodsdetail(mContext);

                                if (StringUtils.isEmpty(oInfo.getGoodsId())||"0".equalsIgnoreCase(oInfo.getGoodsId())) {
                                    return;
                                }

                                Intent intent= new Intent(mContext, GoodsDetailActivity.class);
                                intent.putExtra("goodsId", oInfo.getGoodsId());
                                intent.putExtra("goodsType", oInfo.getGoodsType());

                                intent.putExtra("title", oInfo.getTitle());
                                intent.putExtra("id", oInfo.getGoodsId());
                                intent.putExtra("from", "order");
                                if (!StringUtils.isEmpty(oInfo.getGoodsId()))
                                    mContext.startActivity(intent);
                            }
                        });
                    }
                    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
                            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
                    int topMargin = DimenUtils.dip2px(mContext, 5);
                    int bottomMargin = DimenUtils.dip2px(mContext, 5);
                    if (info.getListOrderGoods().size() == 1) {
                        topMargin = 0;
                        bottomMargin = 0;
                    } else if (info.getListOrderGoods().size() > 1 && i == 0) {
                        topMargin = 0;
                    } else if (info.getListOrderGoods().size() > 1 &&
                            i == info.getListOrderGoods().size() - 1) {
                        bottomMargin = 0;
                    }
                    params.topMargin = topMargin;
                    params.bottomMargin = bottomMargin;
                    view.setLayoutParams(params);
                    viewHolder.ll_goods_info.addView(view);
                }
                String orderNo = info.getOrderNo().replaceAll(" ", "");
                viewHolder.tv_copy.setVisibility(orderNo.endsWith("*") ? View.GONE : View.VISIBLE);
                viewHolder.tv_order_num.setText("订单号：" + info.getOrderNo());
                viewHolder.tv_order_time.setText(info.getDownTime());
                if (StringUtils.isEmpty(info.getReceiveTime())) {
                    viewHolder.tv_take_over_time.setVisibility(View.GONE);
                } else {
                    viewHolder.tv_take_over_time.setVisibility(View.VISIBLE);
                    viewHolder.tv_take_over_time.setText(info.getReceiveTime());
                }
                if (!StringUtils.isEmpty(info.getOrderDesc())) {
                    viewHolder.tv_vip_info.setVisibility(View.VISIBLE);
                    viewHolder.tv_vip_info.setText(info.getOrderDesc());
                } else {
                    viewHolder.tv_vip_info.setVisibility(View.GONE);
                }
                if (info.getRewardDetail() == null && StringUtils.isEmpty(info.getHongBaoDate())) {
                    viewHolder.fl_order_detail.setVisibility(View.GONE);
                } else if (info.getRewardDetail() == null && !StringUtils.isEmpty(info.getHongBaoDate())) {
                    viewHolder.fl_order_detail.setVisibility(View.VISIBLE);
                    viewHolder.tv_arrived_account_time.setVisibility(View.VISIBLE);
                    viewHolder.tv_order_detail.setVisibility(View.GONE);
                    viewHolder.tv_arrived_account_time.setText(info.getHongBaoDate());
                } else if (info.getRewardDetail() != null && !StringUtils.isEmpty(info.getHongBaoDate())) {
                    viewHolder.fl_order_detail.setVisibility(View.VISIBLE);
                    viewHolder.tv_order_detail.setVisibility(View.VISIBLE);
                    viewHolder.tv_arrived_account_time.setVisibility(View.VISIBLE);
                    viewHolder.tv_arrived_account_time.setText(info.getHongBaoDate());

                } else if (info.getRewardDetail() != null && StringUtils.isEmpty(info.getHongBaoDate())) {
                    viewHolder.fl_order_detail.setVisibility(View.VISIBLE);
                    viewHolder.tv_order_detail.setVisibility(View.VISIBLE);
                    viewHolder.tv_arrived_account_time.setVisibility(View.GONE);
                }

                if (info.getRewardDetail() != null) {
                    viewHolder.tv_order_detailtxt.setText(info.getRewardDetail().getText().getContent());
                    viewHolder.tv_order_detailtxt.setTextColor(Color.parseColor(info.getRewardDetail().getText().getColor()));
                    viewHolder.tv_order_detail.setOnClickListener(new View.OnClickListener() {
                    Glide.with(mContext).load(oInfo.getPicture()).into(iv_goods_img);
                    iv_goods_img_cover.setVisibility(View.GONE);
                    tv_goods_title.setPadding(0, 0, 0, 0);
                    tv_goods_title.setText(oInfo.getTitle());
                    view.setOnClickListener(new View.OnClickListener() {
                        @Override
                        public void onClick(View v) {
                            if (info.getRewardDetail().getJump() != null)
                                if (info.getRewardDetail().getJump().getType() == 1) {
                                    JumpActivityUtil.jumpActivity(mContext, info.getRewardDetail().getJump().getJumpDetail(),
                                            info.getRewardDetail().getJump().getParams());
                                } else if (info.getRewardDetail().getJump().getType() == 2) {
                                    getGoodsCouponList(info);
                                }
                            UserCustomEvent.userOrderGoodsdetail(mContext);

                            if (StringUtils.isEmpty(oInfo.getGoodsId()) || "0".equalsIgnoreCase(oInfo.getGoodsId())) {
                                return;
                            }

                            Intent intent = new Intent(mContext, GoodsDetailActivity.class);
                            intent.putExtra("goodsId", oInfo.getGoodsId());
                            intent.putExtra("goodsType", oInfo.getGoodsType());

                            intent.putExtra("title", oInfo.getTitle());
                            intent.putExtra("id", oInfo.getGoodsId());
                            intent.putExtra("from", "order");
                            if (!StringUtils.isEmpty(oInfo.getGoodsId()))
                                mContext.startActivity(intent);
                        }
                    });
                    if (info.getRewardDetail().getTicking() != null) {//显示使用奖励券 倒计时
                        viewHolder.tv_order_detail1.setVisibility(View.VISIBLE);
                        viewHolder.tv_order_detail2.setVisibility(View.VISIBLE);
                        viewHolder.tv_order_detail3.setVisibility(View.VISIBLE);
                        if (info.getRewardDetail().getTicking().get(0) != null) {
                            viewHolder.tv_order_detail1.setText(info.getRewardDetail().getTicking().get(0).getContent());
                            viewHolder.tv_order_detail1.setTextColor(Color.parseColor(info.getRewardDetail().getTicking().get(0).getColor()));
                            float size = 10 * Float.parseFloat(info.getRewardDetail().getTicking().get(0).getFontSize());
                            viewHolder.tv_order_detail1.setTextSize(size);
                        }

                        if (info.getRewardDetail().getTicking().get(1) != null) {
                            viewHolder.tv_order_detail2.setText(info.getRewardDetail().getTicking().get(1).getContent());
                            viewHolder.tv_order_detail2.setTextColor(Color.parseColor(info.getRewardDetail().getTicking().get(1).getColor()));
                            float size = 10 * Float.parseFloat(info.getRewardDetail().getTicking().get(1).getFontSize());
                            viewHolder.tv_order_detail2.setTextSize(size);
                            viewHolder.tv_order_detail2.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
                        }

                        if (info.getRewardDetail().getTicking().get(2) != null) {
                            viewHolder.tv_order_detail3.setText(info.getRewardDetail().getTicking().get(2).getContent());
                            viewHolder.tv_order_detail3.setTextColor(Color.parseColor(info.getRewardDetail().getTicking().get(2).getColor()));
                            float size = 10 * Float.parseFloat(info.getRewardDetail().getTicking().get(2).getFontSize());
                            viewHolder.tv_order_detail3.setTextSize(size);
                        }
                    } else {
                        viewHolder.tv_order_detail1.setVisibility(View.GONE);
                        viewHolder.tv_order_detail2.setVisibility(View.GONE);
                        viewHolder.tv_order_detail3.setVisibility(View.GONE);
                    }
                }

                viewHolder.tv_estimate_reward.setText(info.getHongBaoInfo().getContent());//奖金
                viewHolder.tv_estimate_reward.setTextColor(Color.parseColor(info.getHongBaoInfo().getFontColor()));
                viewHolder.tv_reward_state.setText(info.getAccountState().getContent());//到账状态
                viewHolder.tv_reward_state.setTextColor(Color.parseColor(info.getAccountState().getFontColor()));
                if (!StringUtils.isEmpty(info.getRebateLink())) {//能进入订单详情
                    viewHolder.tv_estimate_in.setVisibility(View.VISIBLE);
                    viewHolder.tv_estimate_in.setOnClickListener(new View.OnClickListener() {
                        @Override
                        public void onClick(View view) {
                            if (!StringUtils.isEmpty(info.getRebateLink()))
                                mContext.startActivity(new Intent(mContext, ShareBrowserActivity.class).putExtra("url", info.getRebateLink()));
                        }
                    });
                tv_order_time.setText("下单时间：" + oInfo.getPlaceOrderTime());
                tv_pay_state.setText(oInfo.getPayState());

                    viewHolder.tv_estimate_reward.setOnClickListener(new View.OnClickListener() {
                        @Override
                        public void onClick(View view) {
                            if (!StringUtils.isEmpty(info.getRebateLink()))
                                mContext.startActivity(new Intent(mContext, ShareBrowserActivity.class).putExtra("url", info.getRebateLink()));
                        }
                    });
                } else {//不能进入订单详情
                    viewHolder.tv_estimate_in.setVisibility(View.GONE);
                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
                        ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
                int topMargin = DimenUtils.dip2px(mContext, 5);
                int bottomMargin = DimenUtils.dip2px(mContext, 5);
                if (info.getListOrderGoods().size() == 1) {
                    topMargin = 0;
                    bottomMargin = 0;
                } else if (info.getListOrderGoods().size() > 1 && i == 0) {
                    topMargin = 0;
                } else if (info.getListOrderGoods().size() > 1 &&
                        i == info.getListOrderGoods().size() - 1) {
                    bottomMargin = 0;
                }
                viewHolder.tv_copy.setOnClickListener(new View.OnClickListener() {
                params.topMargin = topMargin;
                params.bottomMargin = bottomMargin;
                view.setLayoutParams(params);
                viewHolder.ll_goods_info.addView(view);
            }

            String orderNo = info.getOrderNo().replaceAll(" ", "");
            viewHolder.tv_copy.setVisibility(orderNo.endsWith("*") ? View.GONE : View.VISIBLE);
            viewHolder.tv_order_num.setText("订单号：" + info.getOrderNo());
            viewHolder.tv_order_time.setText(info.getDownTime());
            viewHolder.tv_order_time.setVisibility(View.GONE);
            if (StringUtils.isEmpty(info.getReceiveTime())) {
                viewHolder.tv_take_over_time.setVisibility(View.GONE);
            } else {
                viewHolder.tv_take_over_time.setVisibility(View.VISIBLE);
                viewHolder.tv_take_over_time.setText(info.getReceiveTime());
            }
            if (!StringUtils.isEmpty(info.getOrderDesc())) {
                viewHolder.tv_vip_info.setVisibility(View.VISIBLE);
                viewHolder.tv_vip_info.setText(info.getOrderDesc());
            } else {
                viewHolder.tv_vip_info.setVisibility(View.GONE);
            }
            if (info.getRewardDetail() == null && StringUtils.isEmpty(info.getHongBaoDate())) {
                viewHolder.fl_order_detail.setVisibility(View.GONE);
            } else if (info.getRewardDetail() == null && !StringUtils.isEmpty(info.getHongBaoDate())) {
                viewHolder.fl_order_detail.setVisibility(View.VISIBLE);
                viewHolder.tv_arrived_account_time.setVisibility(View.VISIBLE);
                viewHolder.tv_order_detail.setVisibility(View.GONE);
                viewHolder.tv_arrived_account_time.setText(info.getHongBaoDate());
            } else if (info.getRewardDetail() != null && !StringUtils.isEmpty(info.getHongBaoDate())) {
                viewHolder.fl_order_detail.setVisibility(View.VISIBLE);
                viewHolder.tv_order_detail.setVisibility(View.VISIBLE);
                viewHolder.tv_arrived_account_time.setVisibility(View.VISIBLE);
                viewHolder.tv_arrived_account_time.setText(info.getHongBaoDate());

            } else if (info.getRewardDetail() != null && StringUtils.isEmpty(info.getHongBaoDate())) {
                viewHolder.fl_order_detail.setVisibility(View.VISIBLE);
                viewHolder.tv_order_detail.setVisibility(View.VISIBLE);
                viewHolder.tv_arrived_account_time.setVisibility(View.GONE);
            }

            if (info.getRewardDetail() != null) {
                viewHolder.tv_order_detailtxt.setText(info.getRewardDetail().getText().getContent());
                viewHolder.tv_order_detailtxt.setTextColor(Color.parseColor(info.getRewardDetail().getText().getColor()));
                viewHolder.tv_order_detail.setOnClickListener(new View.OnClickListener() {
                    @Override
                    public void onClick(View v) {
                        UserCustomEvent.userOrderCopyOrderId(mContext);
                        ClipboardUtil.copy(mContext, info.getOrderNo());

                        Toast.makeText(mContext, "复制订单成功",
                                Toast.LENGTH_SHORT).show();
                        if (info.getRewardDetail().getJump() != null)
                            if (info.getRewardDetail().getJump().getType() == 1) {
                                JumpActivityUtil.jumpActivity(mContext, info.getRewardDetail().getJump().getJumpDetail(),
                                        info.getRewardDetail().getJump().getParams());
                            } else if (info.getRewardDetail().getJump().getType() == 2) {
                                getGoodsCouponList(info);
                            }
                    }
                });
                if (info.getRewardDetail().getTicking() != null) {//显示使用奖励券 倒计时
                    viewHolder.tv_order_detail1.setVisibility(View.VISIBLE);
                    viewHolder.tv_order_detail2.setVisibility(View.VISIBLE);
                    viewHolder.tv_order_detail3.setVisibility(View.VISIBLE);
                    if (info.getRewardDetail().getTicking().get(0) != null) {
                        viewHolder.tv_order_detail1.setText(info.getRewardDetail().getTicking().get(0).getContent());
                        viewHolder.tv_order_detail1.setTextColor(Color.parseColor(info.getRewardDetail().getTicking().get(0).getColor()));
                        float size = 10 * Float.parseFloat(info.getRewardDetail().getTicking().get(0).getFontSize());
                        viewHolder.tv_order_detail1.setTextSize(size);
                    }

                    if (info.getRewardDetail().getTicking().get(1) != null) {
                        viewHolder.tv_order_detail2.setText(info.getRewardDetail().getTicking().get(1).getContent());
                        viewHolder.tv_order_detail2.setTextColor(Color.parseColor(info.getRewardDetail().getTicking().get(1).getColor()));
                        float size = 10 * Float.parseFloat(info.getRewardDetail().getTicking().get(1).getFontSize());
                        viewHolder.tv_order_detail2.setTextSize(size);
                        viewHolder.tv_order_detail2.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
                    }

                    if (info.getRewardDetail().getTicking().get(2) != null) {
                        viewHolder.tv_order_detail3.setText(info.getRewardDetail().getTicking().get(2).getContent());
                        viewHolder.tv_order_detail3.setTextColor(Color.parseColor(info.getRewardDetail().getTicking().get(2).getColor()));
                        float size = 10 * Float.parseFloat(info.getRewardDetail().getTicking().get(2).getFontSize());
                        viewHolder.tv_order_detail3.setTextSize(size);
                    }
                } else {
                    viewHolder.tv_order_detail1.setVisibility(View.GONE);
                    viewHolder.tv_order_detail2.setVisibility(View.GONE);
                    viewHolder.tv_order_detail3.setVisibility(View.GONE);
                }
            }

            int startIndex = info.getHongBaoInfo().getContent().indexOf("¥");
            Spannable span = new SpannableString(info.getHongBaoInfo().getContent());
            span.setSpan(new RelativeSizeSpan(1.667f), startIndex + 1, info.getHongBaoInfo().getContent().length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
            viewHolder.tv_estimate_reward.setText(span);//奖金
//            viewHolder.tv_estimate_reward.setTextColor(Color.parseColor(info.getHongBaoInfo().getFontColor()));


            viewHolder.tv_reward_state.setText(info.getAccountState().getContent());//到账状态
//            viewHolder.tv_reward_state.setTextColor(Color.parseColor(info.getAccountState().getFontColor()));
//            if (!StringUtils.isEmpty(info.getRebateLink())) {//能进入订单详情
//                viewHolder.tv_estimate_in.setVisibility(View.VISIBLE);
//                viewHolder.tv_estimate_in.setOnClickListener(new View.OnClickListener() {
//                    @Override
//                    public void onClick(View view) {
//                        if (!StringUtils.isEmpty(info.getRebateLink()))
//                            mContext.startActivity(new Intent(mContext, ShareBrowserActivity.class).putExtra("url", info.getRebateLink()));
//                    }
//                });
//
//                viewHolder.tv_estimate_reward.setOnClickListener(new View.OnClickListener() {
//                    @Override
//                    public void onClick(View view) {
//                        if (!StringUtils.isEmpty(info.getRebateLink()))
//                            mContext.startActivity(new Intent(mContext, ShareBrowserActivity.class).putExtra("url", info.getRebateLink()));
//                    }
//                });
//            } else {//不能进入订单详情
//                viewHolder.tv_estimate_in.setVisibility(View.GONE);
//            }

            viewHolder.tv_estimate_in.setVisibility(View.GONE);
            viewHolder.tv_copy.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {
                    UserCustomEvent.userOrderCopyOrderId(mContext);
                    ClipboardUtil.copy(mContext, info.getOrderNo());

                    Toast.makeText(mContext, "复制订单成功",
                            Toast.LENGTH_SHORT).show();
                }
            });

        }
    }


 app/src/main/java/com/tejia/lijin/app/ui/recommend/MultiGoodsShareActivity.java

@@ -774,7 +774,7 @@
            + "/rebateshare_multi_temp";

    private String saveFilePath = android.os.Environment.getExternalStorageDirectory()
            + "/blksapp";
            + "/tejiaapp";

    private View bgView;


 app/src/main/java/com/tejia/lijin/app/ui/recommend/RecommendCategoryAdapter.java

@@ -9,6 +9,9 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
import android.widget.FrameLayout;
import android.widget.HorizontalScrollView;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -98,21 +101,6 @@
                info = mList.get(position);
            }
            ViewHolder viewHolder = (ViewHolder) holder;
            viewHolder.ll_recommend_gv.setVisibility(View.GONE);
            viewHolder.ll_item1.setVisibility(View.VISIBLE);

            if (!isFirst) {
                if ((haveHeaderView() && position % 2 == 1) ||
                        (!haveHeaderView() && position % 2 == 0)) {
//                        Log.e("mResult", "position:" + position);
                    viewHolder.v_left.setVisibility(View.VISIBLE);
                } else {
                    viewHolder.v_left.setVisibility(View.GONE);
                }
            } else {
                viewHolder.v_left.setVisibility(View.GONE);
            }



            /**********************************更具需求不在是搜索结果页才显示商铺名字*************/
@@ -125,21 +113,21 @@
//                viewHolder.ll_shop.setVisibility(View.GONE);
//            }

            GoodsDetailListUtil.setGoodsDetail(mContext,info,viewHolder.goodsDetail);
            GoodsDetailListUtil.setGoodsDetail(mContext, info, viewHolder.goodsDetail);

            // 图片
            Glide.with(mContext).load(info.getPicUrl()).
                    placeholder(R.drawable.ic_goods_default).error(R.drawable.ic_goods_default).
                    transform(new GlideRoundTransform(mContext, 5))
                    .diskCacheStrategy(DiskCacheStrategy.ALL)
                    .into(viewHolder.iv_pic1);
                    .into(viewHolder.iv_pic);

            viewHolder.ll_item1.setOnClickListener(new View.OnClickListener() {
            viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {
                    if (!StringUtils.isEmpty(type))
                        CategoryCustomEvent.classGoods(mContext, type);
                    Intent intent= new Intent(mContext, GoodsDetailActivity.class);
                    Intent intent = new Intent(mContext, GoodsDetailActivity.class);
                    intent.putExtra("goodsId", info.getGoodsId());
                    intent.putExtra("goodsType", info.getGoodsType());
                    intent.putExtra("title", info.getTitle());
@@ -300,61 +288,16 @@


    class ViewHolder extends RecyclerView.ViewHolder {
        TextView tv_name;
        TextView tv_price;
        TextView tv_coupon_price;
        LinearLayout ll_coupon_bg;
        TextView tv_shop_name;
        LinearLayout ll_coupon;
        LinearLayout ll_shop;
        TextView tv_normal_price;
        LinearLayout ll_recommend_gv;
        TextView tv_favourable;//红包，券后价
        TextView tv_sale_num;
        View itemView;
        ImageView iv_pic;
        ImageView iv_pic1;
        ImageView iv_close;
        View v_left;
        TextView tv_shop_name1;
        LinearLayout ll_shop1;
        LinearLayout ll_item1;

        GoodsRightViewHolder goodsDetail;

        public ViewHolder(View convertView) {
            super(convertView);
            /*
            竖屏
             */
            itemView = convertView;
            goodsDetail = new GoodsRightViewHolder(convertView);
            iv_pic = convertView
                    .findViewById(R.id.iv_movie_cover);
            iv_pic1 = convertView
                    .findViewById(R.id.iv_movie_cover1);
            tv_normal_price = convertView
                    .findViewById(R.id.tv_normal_price);
            tv_shop_name = convertView
                    .findViewById(R.id.tv_shop_name2);
            tv_name = convertView
                    .findViewById(R.id.tv_movie_title);
            tv_price = convertView.findViewById(R.id.tv_price);
            ll_coupon_bg = convertView.findViewById(R.id.ll_coupon_bg);
            tv_coupon_price = convertView.findViewById(R.id.tv_coupon_price);
            ll_coupon = convertView.findViewById(R.id.ll_coupon);
            ll_recommend_gv = convertView.findViewById(R.id.ll_recommend_gv);
            tv_favourable = convertView.findViewById(R.id.tv_favourable);
            tv_sale_num = convertView.findViewById(R.id.tv_sale_num);
            ll_shop = convertView.findViewById(R.id.ll_shop2);

            /*
            横屏
             */
            v_left = convertView.findViewById(R.id.v_left);
            ll_item1 = convertView.findViewById(R.id.ll_horizontal_item);
            tv_shop_name1 = convertView
                    .findViewById(R.id.tv_shop_name1);
            ll_shop1 = convertView.findViewById(R.id.ll_shop1);
            iv_close = convertView.findViewById(R.id.iv_close);
                    .findViewById(R.id.iv_pic);
        }
    }


 app/src/main/java/com/tejia/lijin/app/ui/recommend/RecommendCircleSpecialAdapter.java

@@ -52,10 +52,11 @@
    @Override
    public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, final int position) {
        final SpecialOffer2 info = mList.get(position);
        info.setBgColor("#333333");
        if (StringUtils.isNullOrEmpty(info.getBgColor()))
            info.setBgColor("#FFFFFF");
        Holder holder = (Holder) viewHolder;
        holder.tv_name.setText(info.getName() + "");
        Glide.with(mContext).load("https://aecpm.alicdn.com/simba/img/TB1X6uHLVXXXXcCXVXXSutbFXXX.jpg").transform(new GlideRoundTransform(mContext, 18)).into(holder.iv_icon);
        Glide.with(mContext).load(info.getPicture()).transform(new GlideRoundTransform(mContext, 18)).into(holder.iv_icon);
        if (!StringUtils.isEmpty(info.getIcon())) {
            holder.iv_tag.setVisibility(View.VISIBLE);
            Glide.with(mContext).load(info.getIcon()).into(holder.iv_tag);
@@ -102,7 +103,7 @@
        public Holder(View itemView) {
            super(itemView);
            view = itemView;
            fl_content=itemView.findViewById(R.id.fl_content);
            fl_content = itemView.findViewById(R.id.fl_content);
            tv_name = itemView.findViewById(R.id.tv_name);
            iv_icon = itemView.findViewById(R.id.iv_icon);
            iv_tag = itemView.findViewById(R.id.iv_tag);

 app/src/main/java/com/tejia/lijin/app/ui/recommend/RecommendFragment.java

@@ -242,7 +242,7 @@
        iv_slid_top = contentView.findViewById(R.id.iv_slid_top);
        final View top = LayoutInflater.from(rv_recommend_goods.getContext())
                .inflate(R.layout.item_recommend_top, null);
        top.setBackground(HomeUIUtil.getHomeTopBg("#FF227B", "#FF2A3E"));
        top.setBackground(HomeUIUtil.getHomeTopBg(getContext()));
        ll_fragment_activity = top.findViewById(R.id.ll_fragment_activity);
        ll_special_offer = top.findViewById(R.id.ll_special_offer);
        ll_limit_time_buy = top.findViewById(R.id.ll_limit_time_buy);

 app/src/main/java/com/tejia/lijin/app/ui/recommend/RecommendGoodsAdapter.java

@@ -88,7 +88,7 @@
            ViewHolder viewHolder = (ViewHolder) holder1;
            if (showShadow && "jingxuan".equalsIgnoreCase(mFrom)) {
                viewHolder.fl_shadow.setVisibility(View.VISIBLE);
                viewHolder.view_shadow.setBackground(HomeUIUtil.getHomeTopBg("#FF227B", "#FF2A3E"));
                viewHolder.view_shadow.setBackground(HomeUIUtil.getHomeTopBg(mContext));
            } else {
                viewHolder.fl_shadow.setVisibility(View.GONE);
            }

 app/src/main/java/com/tejia/lijin/app/ui/recommend/singleshare/FastShareFragment.java

@@ -391,7 +391,7 @@
    }

    private String saveFilePath = android.os.Environment.getExternalStorageDirectory()
            + "/blksapp";
            + "/tejiaapp";

    private Handler shareHandler = new Handler() {


 app/src/main/java/com/tejia/lijin/app/ui/trends/SendCircleFragmet.java

@@ -753,7 +753,7 @@
                            if (list.length() > 0) {
                                //保存图片
                                String rootPath = android.os.Environment.getExternalStorageDirectory()
                                        + "/blksapp";
                                        + "/tejiaapp";
                                File rootFile = new File(rootPath);
                                if (!rootFile.exists()) {
                                    rootFile.mkdirs();

 app/src/main/java/com/tejia/lijin/app/util/SystemParamsUtil.java

@@ -83,6 +83,8 @@
                editor.putString("invite_code_apply", obj.optString("value"));
            } else if (obj.optString("key").equalsIgnoreCase("onlining")) {//企业微信客服链接
                editor.putString("onlining", obj.optString("value"));
            } else if (obj.optString("key").equalsIgnoreCase("home_page_bg_colors")) {//首页背景颜色
                editor.putString("home_page_bg_colors", obj.optString("value"));
            }
        }
        editor.commit();
@@ -94,4 +96,35 @@
        return sp.getString(key, "");
    }


    /**
     * 获取首页背景颜色
     *
     * @param context
     * @return
     */
    public static String getHomePageBgColors(Context context) {
        return getParam(context, "home_page_bg_colors");
    }

    /**
     * 获取帮助中心链接
     *
     * @param context
     * @return
     */
    public static String getHelpUrl(Context context) {
        return getParam(context, "help");
    }

    /**
     * 获取新手教程
     *
     * @param context
     * @return
     */
    public static String getNewerCourse(Context context) {
        return getParam(context, "web_newer");
    }

}

 app/src/main/java/com/tejia/lijin/app/util/ui/GradientDrawableUtil.java

@@ -16,4 +16,12 @@
        return drawable;
    }


    public static GradientDrawable getOrderType(Context context, String color) {
        GradientDrawable drawable = new GradientDrawable();
        drawable.setCornerRadius(DimenUtils.dip2px(context,3));
        drawable.setColor(Color.parseColor(color));
        return drawable;
    }

}

 app/src/main/java/com/tejia/lijin/app/util/ui/HomeUIUtil.java

@@ -4,10 +4,22 @@
import android.graphics.Color;
import android.graphics.drawable.GradientDrawable;

import com.tejia.lijin.app.util.SystemParamsUtil;
import com.wpc.library.util.common.DimenUtils;
import com.wpc.library.util.common.StringUtils;

public class HomeUIUtil {


    public static GradientDrawable getHomeTopBg(Context context) {
        String color = SystemParamsUtil.getHomePageBgColors(context);
        if (StringUtils.isNullOrEmpty(color)) {
            color = "#FF227B,#FF2A3E";
        }
        return getHomeTopBg(color.split(",")[0], color.split(",")[1]);
    }


    /**
     * 首页顶部背景
     *

 app/src/main/java/com/tejia/lijin/app/util/ui/MineFunctionsManager.java

@@ -81,7 +81,7 @@

    //订单找回
    public void jumpFindOrder() {
        if (!LoginAndInviteStatusUtil.acessNext(context, UserUtil.getUid(context) , true))
        if (!LoginAndInviteStatusUtil.acessNext(context, UserUtil.getUid(context), true))
            return;
        if (!isLogin()) {//登录
            UserUtil.jumpLogin(context);
@@ -92,7 +92,7 @@

    //跳转订单
    public void jumpOrder() {
        if (!LoginAndInviteStatusUtil.acessNext(context, UserUtil.getUid(context) , true))
        if (!LoginAndInviteStatusUtil.acessNext(context, UserUtil.getUid(context), true))
            return;
        UserCustomEvent.userOrder(context);
        if (!isLogin()) {
@@ -105,7 +105,7 @@

    //收藏
    public void jumpCollect() {
        if (!LoginAndInviteStatusUtil.acessNext(context, UserUtil.getUid(context) , true))
        if (!LoginAndInviteStatusUtil.acessNext(context, UserUtil.getUid(context), true))
            return;
        UserCustomEvent.userCollect(context);
        if (isLogin()) {
@@ -139,13 +139,13 @@
        UserCustomEvent.userHelp(context);
        Intent intent1 = new Intent(context, ShareBrowserActivity.class);
        intent1.putExtra("title", "帮助中心");
        intent1.putExtra("url", SystemParamsUtil.getParam(context, "help"));
        intent1.putExtra("url", SystemParamsUtil.getHelpUrl(context));
        context.startActivity(intent1);
    }

    //转链
    public void jumpConvertLink() {
        if (!LoginAndInviteStatusUtil.acessNext(context, UserUtil.getUid(context) , true))
        if (!LoginAndInviteStatusUtil.acessNext(context, UserUtil.getUid(context), true))
            return;
        UserCustomEvent.userConvertLink(context);
        if (isLogin()) {
@@ -158,7 +158,7 @@

    //跳转分享记录
    public void jumpShareHistory() {
        if (!LoginAndInviteStatusUtil.acessNext(context, UserUtil.getUid(context) , true))
        if (!LoginAndInviteStatusUtil.acessNext(context, UserUtil.getUid(context), true))
            return;
        UserCustomEvent.userShareHistory(context);
        if (isLogin()) {
@@ -170,7 +170,7 @@

    //跳转云发单
    public void jumpCloud() {
        if (!LoginAndInviteStatusUtil.acessNext(context, UserUtil.getUid(context) , true))
        if (!LoginAndInviteStatusUtil.acessNext(context, UserUtil.getUid(context), true))
            return;
        if (isLogin()) {
            context.startActivity(new Intent(context, ShareBrowserActivity.class).putExtra("url", cloudUrl).putExtra("clipboard", false + ""));

 app/src/main/java/com/tejia/lijin/app/util/web/BaseRebateJavaInterface.java

@@ -9,6 +9,7 @@
import com.alibaba.baichuan.android.trade.model.OpenType;
import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
import com.tejia.lijin.app.R;
import com.tejia.lijin.app.ui.recommend.GoodsDetailActivity;
import com.tejia.lijin.app.util.Constant;
import com.tejia.lijin.app.util.JumpActivityUtil;
@@ -59,6 +60,12 @@
    }

    @JavascriptInterface
    public String getAppName() {
        return mContext.getResources().getString(R.string.app_name);
    }


    @JavascriptInterface
    public void toast(String str) {
        Toast.makeText(mContext, str, Toast.LENGTH_LONG).show();
    }

 app/src/main/java/com/tejia/lijin/app/util/web/BaseRebateJavaInterfaceBS.java

@@ -10,11 +10,11 @@
import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
import com.tejia.lijin.app.BuXinConstant;
import com.tejia.lijin.app.R;
import com.tejia.lijin.app.ui.recommend.GoodsDetailActivity;
import com.tejia.lijin.app.ui.recommend.GoodsDetailBrowerActivity;
import com.tejia.lijin.app.ui.recommend.SearchActivity;
import com.tejia.lijin.app.util.Constant;
import com.tejia.lijin.app.util.JumpActivityUtil;
import com.tejia.lijin.app.util.SystemParamsUtil;
import com.tejia.lijin.app.util.WXUtil;
import com.tejia.lijin.app.util.clipboard.ClipboardUtil;
import com.tejia.lijin.app.util.user.UserUtil;
@@ -54,9 +54,22 @@


    @JavascriptInterface
    public Object getVersion() {
    public Object getVersion(Object obj) {
        return PackageUtils2.getVersionCode(mContext) + "";
    }


    @JavascriptInterface
    public Object getVersionName(Object obj) {
        return PackageUtils2.getVersionName(mContext) + "";
    }


    @JavascriptInterface
    public Object getAppName(Object obj) {
        return mContext.getResources().getString(R.string.app_name);
    }


    @JavascriptInterface
    public void toast(Object str) {
@@ -140,7 +153,7 @@


    @JavascriptInterface
    public void login() {
    public void login(Object obj) {
        UserUtil.jumpLogin(mContext);
    }

@@ -229,7 +242,7 @@
        Intent intent = new Intent(mContext, GoodsDetailActivity.class);
        intent.putExtra("goodsId", id);
        intent.putExtra("goodsType", goodsType);
        if(!StringUtils.isNullOrEmpty(from))
        if (!StringUtils.isNullOrEmpty(from))
            intent.putExtra("from", from);
        mContext.startActivity(intent);
    }
@@ -246,7 +259,19 @@
     * 清空粘贴板
     */
    @JavascriptInterface
    public void clearClipboard() {
    public void clearClipboard(Object obj) {
        ClipboardUtil.emptyClipboard(mContext);
    }


    /**
     * 获取客户端参数
     *
     * @param key
     * @return
     */
    @JavascriptInterface
    public String getClientParams(String key) {
        return SystemParamsUtil.getParam(mContext, key);
    }
}

 app/src/main/java/com/tejia/lijin/app/util/web/RebateJavaInterface.java

@@ -118,7 +118,7 @@
        } else {//存储权限已开
            String md5 = MD5Utils.getMD532(url);
            String path = com.wpc.library.util.Environment.getExternalStorageDirectory()
                    + "/blksapp";
                    + "/tejiaapp";
            File file = new File(path + "/" + md5 + ".jpg");
            if (!file.exists()) {
                try {
@@ -493,7 +493,7 @@
                    + "/rebateshare";
        } else if (type == 2) {
            path = com.wpc.library.util.Environment.getExternalStorageDirectory()
                    + "/blksapp";
                    + "/tejiaapp";
        }
        final File storageDir = new File(path);
        List<String> filePathList = new ArrayList<>();

 app/src/main/java/com/tejia/lijin/app/util/web/RebateJavaInterfaceBS.java

@@ -43,6 +43,7 @@
import com.tejia.lijin.app.entity.share.ShareImageEntity;
import com.tejia.lijin.app.ui.dialog.ShapeLoadingDialog;
import com.tejia.lijin.app.ui.invite.ShareBrowserActivity;
import com.tejia.lijin.app.updateApp.UpdateApp;
import com.tejia.lijin.app.util.JumpActivityUtil;
import com.tejia.lijin.app.util.PermissionHelper;
import com.tejia.lijin.app.util.ToastUtil;
@@ -129,7 +130,7 @@
        } else {//存储权限已开
            String md5 = MD5Utils.getMD532(url.toString());
            String path = com.wpc.library.util.Environment.getExternalStorageDirectory()
                    + "/blksapp";
                    + "/tejiaapp";
            File file = new File(path + "/" + md5 + ".jpg");
            if (!file.exists()) {
                try {
@@ -145,6 +146,53 @@

            } else {
                Toast.makeText(mContext, "图片已经保存!", Toast.LENGTH_LONG).show();
            }
        }
    }


    /**
     * 异步保存图片
     *
     * @param args
     * @param handler
     * @throws JSONException
     */
    public void savePictureAsync(Object args, final CompletionHandler handler) throws JSONException {
        JSONObject jsonObject = new JSONObject(args.toString());
        String url = jsonObject.optString("url");
        if (mPermissionsChecker == null)
            mPermissionsChecker = new PermissionHelper(mContext, this);
        if (mPermissionsChecker.lacksPermissions(getPermissions())) { //存储权限未开启
            mPermissionsChecker.showNormalDialog();
        } else {//存储权限已开
            String md5 = MD5Utils.getMD532(url);
            String path = com.wpc.library.util.Environment.getExternalStorageDirectory()
                    + "/tejiaapp";
            File file = new File(path + "/" + md5 + ".jpg");
            if (!file.exists()) {
                try {
                    File resultFile = Tools.saveImageFromPathToSdCard(mContext, url, path, md5 + ".jpg");
                    if (resultFile != null) {
                        JSONObject result = new JSONObject();
                        result.put("code", 0);
                        result.put("msg", "保存成功");
                        handler.complete(result);
                    }
                } catch (Exception e) {
                    JSONObject result = new JSONObject();
                    result.put("code", 1);
                    result.put("msg", "图片保存失败");
                    handler.complete(result);
                    if (file.exists())
                        file.delete();
                }

            } else {
                JSONObject result = new JSONObject();
                result.put("code", 2);
                result.put("msg", "图片已经保存");
                handler.complete(result);
            }
        }
    }
@@ -539,7 +587,7 @@

                            @Override
                            public void onVideoError() {
                                com.alibaba.fastjson.JSONObject  result = new com.alibaba.fastjson.JSONObject();
                                com.alibaba.fastjson.JSONObject result = new com.alibaba.fastjson.JSONObject();
                                result.put("code", 2);
                                result.put("msg", "视频出错");
                                handler.complete(result);
@@ -547,7 +595,7 @@

                            @Override
                            public void onRewardVerify(boolean b, int i, String s, int i1, String s1) {
                                com.alibaba.fastjson.JSONObject  result = new com.alibaba.fastjson.JSONObject();
                                com.alibaba.fastjson.JSONObject result = new com.alibaba.fastjson.JSONObject();
                                result.put("code", 0);
                                result.put("msg", "广告展示完成");
                                handler.complete(result);
@@ -595,6 +643,31 @@
            }
        });
    }


    @JavascriptInterface
    public void checkUpdate(Object obj) {
        UpdateApp app = new UpdateApp(mContext,mContext.getResources().getString(R.string.update_key));
        app.getUpdateInfo(new UpdateApp.UpdateJudgeCallback() {

            @Override
            public void onSuccess(boolean show) {

            }

            @Override
            public void closeUpdate(boolean close) {

            }

            @Override
            public void onFinish() {

            }
        }, true);//强制检测更新
    }




    int type;
@@ -665,7 +738,7 @@
                    + "/rebateshare";
        } else if (type == 2) {
            path = com.wpc.library.util.Environment.getExternalStorageDirectory()
                    + "/blksapp";
                    + "/tejiaapp";
        }
        final File storageDir = new File(path);
        List<String> filePathList = new ArrayList<>();

 app/src/main/res/drawable/shape_search.xml

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

    <stroke android:width="2dp" android:color="#FF2C4A" />

    <solid android:color="#ffffffff" />
    <stroke
        android:width="1.5dp"
        android:color="#ff2c4a" />

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

</shape>

 app/src/main/res/drawable/shape_search_main.xml

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

    <solid android:color="#ffffffff" />

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

</shape>

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

@@ -211,43 +211,6 @@

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

            <LinearLayout
                android:id="@+id/ll_go_scan"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:gravity="center"
                android:orientation="vertical"
                android:visibility="gone">

                <ImageView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:src="@drawable/ic_collect_null" />

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="20dp"
                    android:textSize="15sp"
                    android:textColor="@color/text_black_1"
                    android:text="不会吧，没有你喜欢的商品吗~" />

                <TextView
                    android:id="@+id/tv_go_scan"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="20dp"
                    android:background="@drawable/shape_go_search"
                    android:gravity="center"
                    android:paddingLeft="12dp"
                    android:paddingTop="5dp"
                    android:paddingRight="12dp"
                    android:paddingBottom="5dp"
                    android:text="去逛逛"
                    android:textColor="@color/white"
                    android:visibility="gone" />
            </LinearLayout>

        </FrameLayout>
    </LinearLayout>

 app/src/main/res/layout/activity_login_select.xml

@@ -21,12 +21,12 @@


        <TextView
            android:padding="8dp"
            android:id="@+id/tv_help"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_height="25dp"
            android:layout_gravity="right|center"
            android:layout_marginRight="20dp"
            android:padding="8dp"
            android:text="帮助"
            android:textColor="#333333"
            android:textSize="15sp" />

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

@@ -241,45 +241,7 @@
                            android:layout_height="wrap_content"
                            android:visibility="visible" />

                        <LinearLayout
                            android:id="@+id/ll_go_scan"
                            android:layout_width="match_parent"
                            android:layout_height="match_parent"
                            android:layout_gravity="center"
                            android:gravity="center"
                            android:orientation="vertical"
                            android:visibility="gone">

                            <ImageView
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:src="@drawable/ic_order_form_null" />

                            <TextView
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_gravity="center"
                                android:layout_marginTop="20dp"
                                android:gravity="center"
                                android:text="糟糕，你还没有订单，感觉\n损失了一个亿"
                                android:textColor="@color/text_black_1"
                                android:textSize="15sp" />

                            <TextView
                                android:id="@+id/tv_go_scan"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_marginTop="20dp"
                                android:background="@drawable/shape_go_search"
                                android:gravity="center"
                                android:paddingLeft="12dp"
                                android:paddingTop="5dp"
                                android:paddingRight="12dp"
                                android:paddingBottom="5dp"
                                android:text="去逛逛"
                                android:textColor="@color/white"
                                android:visibility="gone" />
                        </LinearLayout>
                        <include layout="@layout/item_no_data" />
                    </LinearLayout>
                </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

@@ -291,7 +253,7 @@
                    android:background="@color/black"
                    android:visibility="gone" />
            </FrameLayout>

            

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


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

@@ -75,7 +75,7 @@
                            android:layout_height="wrap_content"
                            android:layout_gravity="center_vertical"
                            android:layout_marginLeft="15dp"
                            android:src="@drawable/ic_recommend_search" />
                            android:src="@drawable/icon_search_gray" />
                    </FrameLayout>

                </LinearLayout>
@@ -89,7 +89,7 @@
                    android:gravity="center"
                    android:padding="5dp"
                    android:text="搜索"
                    android:textColor="@color/black"
                    android:textColor="@color/search_btn_text_color"
                    android:textSize="18sp" />
            </LinearLayout>
        </LinearLayout>

 app/src/main/res/layout/dialog_goods_detail_jump_loading.xml

@@ -42,7 +42,7 @@
        <com.wpc.library.widget.RatioLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:ratio="0.5457">
            app:ratio="0.58">

            <FrameLayout
                android:id="@+id/fl_ad"

 app/src/main/res/layout/dialog_goods_detail_notify.xml

@@ -3,6 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:gravity="center_horizontal"
    android:orientation="vertical">

    <LinearLayout
@@ -48,14 +49,6 @@
            android:textColor="#fff73547"
            android:textSize="16sp" />

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="16dp"
            android:text="1.确认购买后创建2.看广告增加创建次数"
            android:textColor="#ff666666"
            android:textSize="12sp" />


        <LinearLayout
            android:layout_width="match_parent"
@@ -67,10 +60,10 @@
                android:id="@+id/tv_create"
                android:layout_width="0dp"
                android:layout_height="36dp"
                android:layout_marginRight="8dp"
                android:layout_weight="1"
                android:gravity="center"
                android:text="仍要创建"
                android:layout_marginRight="8dp"
                android:textColor="#fff53245"
                android:textSize="15sp" />

@@ -91,5 +84,12 @@

    </LinearLayout>

    <ImageView
        android:id="@+id/iv_close"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="30dp"
        android:src="@drawable/icon_dialog_vip_upgraded_close"></ImageView>


</LinearLayout>

 app/src/main/res/layout/fragment_activity.xml

@@ -19,7 +19,7 @@
            android:layout_gravity="center_vertical"
            android:layout_marginLeft="10dp"
            android:layout_marginRight="10dp"
            android:background="@drawable/selector_search_bg">
            android:background="@drawable/shape_search_main">

            <TextView
                android:id="@+id/tv_search_content"

 app/src/main/res/layout/fragment_recommend_top.xml

@@ -45,7 +45,7 @@
                            android:layout_height="38dp"
                            android:layout_gravity="center_vertical"
                            android:layout_weight="1"
                            android:background="@drawable/selector_search_bg">
                            android:background="@drawable/shape_search_main">

                            <TextView
                                android:id="@+id/tv_search_content"
@@ -63,6 +63,7 @@
                        </FrameLayout>

                        <TextView
                            android:id="@+id/tv_course"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_marginLeft="16dp"

 app/src/main/res/layout/item_filter_order.xml

@@ -32,7 +32,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginLeft="13dp"
            android:layout_marginTop="15dp"
            android:layout_marginTop="8dp"
            android:layout_marginRight="13dp"
            android:orientation="horizontal">

@@ -64,7 +64,7 @@
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:gravity="right|center_vertical"
                android:textColor="@color/gray3"
                android:textColor="@color/text_black_1"
                android:textSize="15sp" />
        </LinearLayout>

@@ -73,7 +73,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginLeft="13dp"
            android:layout_marginTop="20dp"
            android:layout_marginTop="9dp"
            android:layout_marginRight="13dp"
            android:background="@color/register_gray2"
            android:orientation="vertical">
@@ -85,7 +85,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginLeft="13dp"
            android:layout_marginTop="20dp"
            android:layout_marginTop="10dp"
            android:layout_marginRight="13dp"
            android:orientation="horizontal">

@@ -146,7 +146,7 @@
            android:layout_width="match_parent"
            android:layout_height="1px"
            android:layout_marginLeft="13dp"
            android:layout_marginTop="15dp"
            android:layout_marginTop="10dp"
            android:layout_marginRight="13dp"
            android:background="@color/trends_goods_bg" />

@@ -233,11 +233,24 @@
                android:orientation="horizontal">

                <TextView
                    android:id="@+id/tv_reward_state"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:gravity="left"
                    android:textColor="#FF2C4A"
                    android:textSize="16sp" />

                <View
                    android:layout_width="wrap_content"
                    android:layout_height="1px"
                    android:layout_weight="1" />

                <TextView
                    android:id="@+id/tv_estimate_reward"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:textColor="@color/main_text_color"
                    android:textSize="17sp" />
                    android:textColor="#FF2C4A"
                    android:textSize="12sp" />


                <ImageView
@@ -248,19 +261,7 @@
                    android:background="@drawable/ic_order_in"
                    android:padding="1dp" />

                <View
                    android:layout_width="wrap_content"
                    android:layout_height="1px"
                    android:layout_weight="1" />

                <TextView
                    android:id="@+id/tv_reward_state"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:gravity="right"
                    android:textColor="@color/main_text_color"
                    android:textSize="17sp"
                    android:textStyle="bold" />
            </LinearLayout>

            <LinearLayout

 app/src/main/res/layout/item_filter_order_goods.xml

@@ -49,20 +49,63 @@
            android:textColor="@color/gray5"
            android:textSize="12sp" />

        <TextView
            android:id="@+id/tv_goods_consume"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="8dp"
            android:textColor="@color/gray5"
            android:textSize="12sp" />

        <TextView
            android:id="@+id/tv_goods_num"
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="5dp"
            android:textColor="@color/gray5"
            android:textSize="12sp" />
            android:gravity="center_vertical"
            android:orientation="horizontal"
            android:paddingRight="7dp">

            <TextView
                android:id="@+id/tv_goods_consume"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textColor="@color/gray5"
                android:textSize="12sp" />

            <View
                android:layout_width="0dp"
                android:layout_height="1dp"
                android:layout_weight="1"></View>

            <TextView
                android:id="@+id/tv_goods_num"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textColor="@color/gray5"
                android:textSize="12sp" />

        </LinearLayout>

        <LinearLayout
            android:paddingRight="7dp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="8dp"
            android:orientation="horizontal">

            <TextView
                android:id="@+id/tv_order_time"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textColor="@color/gray5"
                android:textSize="12sp" />

            <View
                android:layout_width="0dp"
                android:layout_height="1dp"
                android:layout_weight="1"></View>

            <TextView
                android:id="@+id/tv_pay_state"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textColor="@color/gray5"
                android:textSize="12sp" />

        </LinearLayout>


    </LinearLayout>
</LinearLayout>

 app/src/main/res/layout/navigation_bottom_bar.xml

@@ -81,10 +81,9 @@
            android:background="@drawable/shape_mine_msg_bg"
            android:gravity="center"
            android:minWidth="16dp"
            android:text="99+"
            android:textColor="#ffff2a59"
            android:textSize="10sp"
            android:visibility="visible" />
            android:visibility="gone" />


    </LinearLayout>