老版本特价

admin

2021-05-28 98cc34dbca6d6218ec5e72baffda2d3a1dd72a55

老版本特价

 app/build.gradle

@@ -272,5 +272,8 @@

    implementation 'com.wang.avi:library:2.1.3'

    //富文本
    implementation 'com.zzhoujay.richtext:richtext:3.0.7'


}

 app/src/main/AndroidManifest.xml

@@ -75,8 +75,14 @@
            android:theme="@style/fullScreen">

            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />

@@ -92,12 +98,7 @@
            android:screenOrientation="portrait"
            android:theme="@style/AppTabTheme1"
            android:windowSoftInputMode="adjustPan">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>


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

@@ -65,6 +65,8 @@

    public static OkHttpClient mOkHttpClientSoon;//okHttpClient 实例

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

    static {
        mOkHttpClient = new OkHttpClient.Builder()
                .connectTimeout(10 * 1000, TimeUnit.MILLISECONDS)
@@ -3595,7 +3597,7 @@
        int version = PackageUtils2.getVersionCode(context);
        long time = System.currentTimeMillis();
        String deviceType = MobileUtil.getSystemModel();
        params.put("packages", "com.youhuiquan.android");
        params.put("packages", API_PACKAGE_NAME);
        params.put("Version", version + "");
        params.put("appkey", BuXinConstant.TAO_BAO_KE_KEY);
        params.put("platform", "android");
@@ -3645,7 +3647,7 @@
        int version = PackageUtils2.getVersionCode(context);
        long time = System.currentTimeMillis();
        String deviceType = MobileUtil.getSystemModel();
        params.put("packages", "com.youhuiquan.android");
        params.put("packages", API_PACKAGE_NAME);
        params.put("Version", version + "");
        params.put("appkey", BuXinConstant.TAO_BAO_KE_KEY);
        params.put("platform", "android");
@@ -3704,7 +3706,7 @@
        int version = PackageUtils2.getVersionCode(context);
        long time = System.currentTimeMillis();
        String deviceType = MobileUtil.getSystemModel();
        params.put("packages", "com.youhuiquan.android");
        params.put("packages", API_PACKAGE_NAME);
        params.put("Version", version + "");
        params.put("appkey", BuXinConstant.TAO_BAO_KE_KEY);
        params.put("platform", "android");

 app/src/main/java/com/tejia/lijin/app/presenter/JdSpeciaFgPresenter.java

@@ -15,6 +15,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.tejia.lijin.app.util.user.UserUtil;
import com.viewpagerindicator.LinePageIndicator;
import com.wpc.library.util.NetUtils;
import com.wpc.library.util.SystemCommon;
@@ -271,7 +272,6 @@
     * @return 登陆状态
     */
    public boolean isLogin() {
        final SharedPreferences sp = mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
        return sp.getBoolean("isLogin", false);
        return UserUtil.isLogin(mContext);
    }
}

 app/src/main/java/com/tejia/lijin/app/presenter/JdSpeciaPresenter.java

@@ -13,6 +13,7 @@
import com.tejia.lijin.app.model.JdSpecialModel;
import com.tejia.lijin.app.ui.dialog.ShapeLoadingDialog;
import com.tejia.lijin.app.util.JDGoodsJump;
import com.tejia.lijin.app.util.user.UserUtil;

import org.json.JSONObject;

@@ -92,9 +93,7 @@
     * @return
     */
    public boolean isLogin() {
        final SharedPreferences sp = mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
        boolean isLogin = sp.getBoolean("isLogin", false);
        return isLogin;
        return UserUtil.isLogin(mContext);
    }

    //--3.京东的包名

 app/src/main/java/com/tejia/lijin/app/presenter/PddSpeciaFgPresenter.java

@@ -16,6 +16,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.tejia.lijin.app.util.user.UserUtil;
import com.viewpagerindicator.LinePageIndicator;
import com.wpc.library.util.NetUtils;
import com.wpc.library.util.SystemCommon;
@@ -279,8 +280,7 @@
     * @return
     */
    public boolean isLogin() {
        final SharedPreferences sp = mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
        return sp.getBoolean("isLogin", false);
      return  UserUtil.isLogin(mContext);
    }

}

 app/src/main/java/com/tejia/lijin/app/presenter/PddSpeciaPresenter.java

@@ -10,6 +10,7 @@
import com.tejia.lijin.app.entity.HotSearch;
import com.tejia.lijin.app.model.PddSpecialModel;
import com.tejia.lijin.app.ui.dialog.ShapeLoadingDialog;
import com.tejia.lijin.app.util.user.UserUtil;

import org.json.JSONObject;

@@ -89,9 +90,7 @@
     * @return
     */
    public boolean isLogin() {
        final SharedPreferences sp = mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
        boolean isLogin = sp.getBoolean("isLogin", false);
        return isLogin;
        return  UserUtil.isLogin(mContext);
    }

}

 app/src/main/java/com/tejia/lijin/app/presenter/SuningSpeciaFgPresenter.java

@@ -15,6 +15,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.tejia.lijin.app.util.user.UserUtil;
import com.viewpagerindicator.LinePageIndicator;
import com.wpc.library.util.NetUtils;
import com.wpc.library.util.SystemCommon;
@@ -271,7 +272,6 @@
     * @return 登陆状态
     */
    public boolean isLogin() {
        final SharedPreferences sp = mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
        return sp.getBoolean("isLogin", false);
        return  UserUtil.isLogin(mContext);
    }
}

 app/src/main/java/com/tejia/lijin/app/presenter/SuningSpeciaPresenter.java

@@ -13,6 +13,7 @@
import com.tejia.lijin.app.model.SuningSpecialModel;
import com.tejia.lijin.app.ui.dialog.ShapeLoadingDialog;
import com.tejia.lijin.app.util.JDGoodsJump;
import com.tejia.lijin.app.util.user.UserUtil;

import org.json.JSONObject;

@@ -92,9 +93,7 @@
     * @return
     */
    public boolean isLogin() {
        final SharedPreferences sp = mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
        boolean isLogin = sp.getBoolean("isLogin", false);
        return isLogin;
        return  UserUtil.isLogin(mContext);
    }

    //--3.京东的包名

 app/src/main/java/com/tejia/lijin/app/presenter/VipShopSpeciaFgPresenter.java

@@ -15,6 +15,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.tejia.lijin.app.util.user.UserUtil;
import com.viewpagerindicator.LinePageIndicator;
import com.wpc.library.util.NetUtils;
import com.wpc.library.util.SystemCommon;
@@ -271,7 +272,6 @@
     * @return 登陆状态
     */
    public boolean isLogin() {
        final SharedPreferences sp = mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
        return sp.getBoolean("isLogin", false);
        return  UserUtil.isLogin(mContext);
    }
}

 app/src/main/java/com/tejia/lijin/app/presenter/VipShopSpeciaPresenter.java

@@ -13,6 +13,7 @@
import com.tejia.lijin.app.model.VipShopSpecialModel;
import com.tejia.lijin.app.ui.dialog.ShapeLoadingDialog;
import com.tejia.lijin.app.util.JDGoodsJump;
import com.tejia.lijin.app.util.user.UserUtil;

import org.json.JSONObject;

@@ -92,9 +93,7 @@
     * @return
     */
    public boolean isLogin() {
        final SharedPreferences sp = mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
        boolean isLogin = sp.getBoolean("isLogin", false);
        return isLogin;
        return  UserUtil.isLogin(mContext);
    }

    //--3.京东的包名

 app/src/main/java/com/tejia/lijin/app/ui/goldtask/GoldTaskAdapter.java

@@ -373,7 +373,6 @@
     * @return 登陆状态
     */
    public boolean isLogin() {
        final SharedPreferences sp = mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
        return sp.getBoolean("isLogin", false);
        return  UserUtil.isLogin(mContext);
    }
}

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

@@ -118,9 +118,9 @@

    private void init() {
        ((FrameLayout) mAquery.id(R.id.fl_search).getView()).setBackground(HomeUIUtil.getHomeTopBg("#FF227B", "#FF2A3E"));
        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);
//        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);
        pd = new ShapeLoadingDialog.Builder(getContext()).build();

        float hRatio = 260 / 720f;

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

@@ -27,6 +27,7 @@
import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
import android.widget.Toast;

import com.app.hubert.guide.util.ScreenUtils;
@@ -104,7 +105,8 @@


    private SharedPreferences spkefu;
    private ImageView img, tv_msg_num2;
    private ImageView img;
    private TextView tv_msg_count;
    private DragFloatActionButton acbutton;

    String tag1 = "systemclient/getsystemclientparams";
@@ -231,12 +233,12 @@
        getSystemParams();
        v_no_login = findViewById(R.id.v_no_login);
        acbutton = findViewById(R.id.actionButton);
        tv_msg_num2 = findViewById(R.id.tv_msg_num2);//我的红点
        tv_msg_count = findViewById(R.id.tv_msg_count);//消息数量
        acbutton.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                //登陆
                if (getSharedPreferences("user", MODE_PRIVATE).getBoolean("isLogin", false)) {
                if (UserUtil.isLogin(getApplicationContext())) {
                    LoginTaobao.getLoginTaobao(MainActivity.this, new LonginTaobaoCallback() {
                        @Override
                        public void onSuccess() {
@@ -361,7 +363,7 @@
                    JSONArray array = jsonObject.optJSONObject("data").optJSONArray("systemClientParamsList");
                    SystemParamsUtil.saveParams(getApplicationContext(), array);
                    boolean input = sp.getBoolean("isFirstInput", true);
                    boolean isLogin = sp.getBoolean("isLogin", false);
                    boolean isLogin = UserUtil.isLogin(getApplicationContext());
                    //新人好礼1元红包
                    if (input && !isLogin && sp.getString("newuser", "1").equalsIgnoreCase("0")) {
                        isFirstInput();
@@ -371,7 +373,7 @@
                    textVideo.isRecord(jsonObject);
                    //服务器让显示 购物车&&本地也让显示
                    if (textVideo.getCart_float().equals("1") && textVideo.getLocalCart_float() != 1
                            && getSharedPreferences("user", MODE_PRIVATE).getBoolean("isLogin", false)) {
                            && UserUtil.isLogin(getApplicationContext())) {
                        acbutton.setVisibility(View.VISIBLE);
                    } else {//隐藏购物车
                        acbutton.setVisibility(View.GONE);
@@ -406,7 +408,7 @@
            BuXinConstant.GO_SCAN = false;
            ((RadioButton) findViewById(R.id.rb_nav_recommend)).setChecked(true);
        }
        boolean isLogin = sp.getBoolean("isLogin", false);
        boolean isLogin = UserUtil.isLogin(getApplicationContext());
        v_no_login.setVisibility(isLogin ? View.INVISIBLE : View.VISIBLE);
        getUnReadMsgCount(UserUtil.getUid(ShoppingApplication.application));//消息 未读数量

@@ -434,7 +436,7 @@
            RecordImageTextVideo textVideo = new RecordImageTextVideo(MainActivity.this);
            //服务器让显示 购物车&&本地也让显示不为1
            if (textVideo.getCart_float().equals("1") && textVideo.getLocalCart_float() != 1 &&
                    getSharedPreferences("user", MODE_PRIVATE).getBoolean("isLogin", false)) {
                    UserUtil.isLogin(getApplicationContext())) {
                acbutton.setVisibility(View.VISIBLE);
                //点击过 再显示（让按钮复位）
                if (textVideo.getLocalCart_float() == 2) {
@@ -497,11 +499,15 @@
                    } else {
                        totalCount = 0;
                    }
                    totalCount = 0;
                } else {
                    totalCount = 0;
                    tv_msg_num2.setVisibility(View.INVISIBLE);//隐藏我的红点
                }

                tv_msg_count.setVisibility(totalCount > 0 ? View.VISIBLE : View.INVISIBLE);
                if (totalCount > 0) {
                    tv_msg_count.setText(totalCount >= 100 ? "99+" : (totalCount + ""));
                }

                setUnReadMsgCount(jsonObject);
                getgetHomeMsgList();//获取未读消息条数
            }
@@ -529,7 +535,7 @@
            }
        }
        //展示我的 红点
        tv_msg_num2.setVisibility(jsonObject.optJSONObject("data").optInt("mineCount") > 0 ? View.VISIBLE : View.INVISIBLE);
//        int msgCount = jsonObject.optJSONObject("data").optInt("mineCount");
    }

    private void isFirstInput() {

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

@@ -154,7 +154,7 @@
        initView(view);
        addListener();
        spkefu = getActivity().getSharedPreferences("kefurecord", Context.MODE_PRIVATE);//是否打开过客服  记录
        if (sp.getBoolean("isLogin", false)) {//登陆显示消息中心红包弹窗
        if (UserUtil.isLogin(getContext())) {//登陆显示消息中心红包弹窗
            getMSGConfig();//消息中心红包
        }
    }
@@ -308,8 +308,6 @@
        ll_request_failture = view.findViewById(R.id.ll_request_failture);
        tv_no_data_hint = view.findViewById(R.id.tv_no_data_hint);
        iv_no_data = view.findViewById(R.id.iv_no_data);
        tv_no_data_hint.setText("还没有消息~");
        iv_no_data.setImageDrawable(getActivity().getResources().getDrawable(R.drawable.ic_no_friends));
        view.findViewById(R.id.tv_net_setting).setOnClickListener(this);
        view.findViewById(R.id.tv_refresh).setOnClickListener(this);

@@ -410,7 +408,7 @@
        mChangeHelper.registerReceiver();
        getMessage();
        getUnReadMsgCount();
        boolean isLogin = sp.getBoolean("isLogin", false);
        boolean isLogin = UserUtil.isLogin(getContext());
        if (!isLogin) { //判断未登陆  隐藏清空按钮和 去旧版
            if (iv_top_bar_clear.getVisibility() == View.VISIBLE | tv_top_bar_right.getVisibility() == View.VISIBLE) {
                iv_top_bar_clear.setVisibility(View.GONE);
@@ -456,7 +454,7 @@
     * 获取主页消息列表
     */
    private void getMessage() {
        final boolean isLogin = sp.getBoolean("isLogin", false);
        final boolean isLogin =UserUtil.isLogin(getContext());
        ((MainActivity) getActivity()).getMessageMain(new MainActivity.getHomeMsgListListener() {
            @Override
            public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws JSONException, ParseException {
@@ -570,7 +568,7 @@

    @Override
    public void onClick(View v) {
        boolean isLogin = sp.getBoolean("isLogin", false);
        boolean isLogin =UserUtil.isLogin(getContext());
        switch (v.getId()) {
            case R.id.fl_order_notice: {
                if (!LoginAndInviteStatusUtil.acessNext(getContext(), UserUtil.getUid(getContext()) , true))
@@ -727,7 +725,7 @@
     * 展示红包等级福利提示Dialog
     */
    private void showHintDialog(RedPacketHintDialog.Builder builder, final JSONObject floatImgDetail) {
        final boolean isLogin = getContext().getSharedPreferences("user", Context.MODE_PRIVATE).getBoolean("isLogin", false);
        final boolean isLogin = UserUtil.isLogin(getContext());
        mPresenter.showHintDialog(builder, floatImgDetail, accountLogin, isLogin);
    }

@@ -799,7 +797,7 @@
                    mPresenter.setMSGConfig_jumpDetailnull(builder);
                } else {
                    String showTime = floatImgDetail.optString("showTime");
                    final boolean isLogin = sp.getBoolean("isLogin", false);
                    final boolean isLogin = UserUtil.isLogin(getContext());
                    //是否是当天当月当年
                    if (showTime.equalsIgnoreCase("everyday") && mPresenter.isSameDay(new Date(System.currentTimeMillis()), new Date(sp.getLong("redPacketHintmsg", 0l)))) {
                        return;

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

@@ -453,8 +453,7 @@

    @Override
    public void onClick(View v) {
        final SharedPreferences sp = getActivity().getSharedPreferences("user", Context.MODE_PRIVATE);
        boolean isLogin = sp.getBoolean("isLogin", false);
        boolean isLogin = UserUtil.isLogin(getContext());
        clickState = 0;
        switch (v.getId()) {
            case R.id.vp_close:
@@ -663,7 +662,7 @@
                    }

                } else if (jsonObject.optInt("code") == 80001) {
                    if (tv_nickName.getContext().getSharedPreferences("user", MODE_PRIVATE).getBoolean("isLogin", false)) {
                    if (UserUtil.isLogin(getContext())) {
                        loginOut();
                        UserUtil.logout(tv_nickName.getContext());
                        noLogin();

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

@@ -52,7 +52,6 @@
import com.tejia.lijin.app.ui.invite.ShareBrowserActivity;
import com.tejia.lijin.app.ui.mine.ShoppingTrolleyActivity;
import com.tejia.lijin.app.ui.recommend.RecommendCategoryFragment;
import com.tejia.lijin.app.ui.recommend.RecommendFragment;
import com.tejia.lijin.app.ui.recommend.SearchActivity;
import com.tejia.lijin.app.updateApp.UpdateApp;
import com.tejia.lijin.app.util.JumpActivityUtil;
@@ -71,6 +70,7 @@
import com.wpc.library.util.cache.DiskLruCache;
import com.wpc.library.util.common.StorageUtils;
import com.wpc.library.util.common.StringUtils;
import com.tejia.lijin.app.ui.recommend.RecommendFragment;

import net.lucode.hackware.magicindicator.MagicIndicator;
import net.lucode.hackware.magicindicator.ViewPagerHelper;
@@ -480,7 +480,7 @@
            }
        }, 1000);

        boolean isLogin = sp.getBoolean("isLogin", false);
        boolean isLogin =UserUtil.isLogin(getContext());
        if (isLogin) {
            getUserInfo(UserUtil.getUid(ShoppingApplication.application));
            if (accountLogin && floatImgDetail != null) {//弹框需要登陆
@@ -864,8 +864,7 @@
                            builder.setPositiveButton(new DialogInterface.OnClickListener() {
                                @Override
                                public void onClick(DialogInterface dialog, int which) {
                                    final boolean isLogin = getContext().getSharedPreferences("user",
                                            MODE_PRIVATE).getBoolean("isLogin", false);
                                    final boolean isLogin = UserUtil.isLogin(getContext());
                                    if (accountLogin && !isLogin) {
                                        clickState = 3;
                                        UserUtil.jumpLogin(getContext());
@@ -976,8 +975,7 @@
        builder.setPositiveButton(new DialogInterface.OnClickListener() {
            @Override
            public void onClick(DialogInterface dialog, int which) {
                final boolean isLogin = getContext().getSharedPreferences("user",
                        MODE_PRIVATE).getBoolean("isLogin", false);
                final boolean isLogin = UserUtil.isLogin(getContext());
                if (accountLogin && !isLogin) {
                    clickState = 4;
                    UserUtil.jumpLogin(getContext());

 app/src/main/java/com/tejia/lijin/app/ui/message/AppMailActivity.java

@@ -104,8 +104,6 @@
        ll_request_failture = findViewById(R.id.ll_request_failture);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);
        tv_no_data_hint.setText("还没有消息~");
        iv_no_data.setImageDrawable(getResources().getDrawable(R.drawable.ic_no_friends));
        findViewById(R.id.tv_net_setting).setOnClickListener(this);
        findViewById(R.id.tv_refresh).setOnClickListener(this);


 app/src/main/java/com/tejia/lijin/app/ui/message/SystemMessageActivity.java

@@ -77,8 +77,6 @@
        ll_request_failture = findViewById(R.id.ll_request_failture);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);
        tv_no_data_hint.setText("还没有消息~");
        iv_no_data.setImageDrawable(getResources().getDrawable(R.drawable.ic_no_friends));
        findViewById(R.id.tv_net_setting).setOnClickListener(this);
        findViewById(R.id.tv_refresh).setOnClickListener(this);


 app/src/main/java/com/tejia/lijin/app/ui/message/UserMessageActivity.java

@@ -103,22 +103,6 @@
        title = StringUtils.isNullOrEmpty(title) ? "消息" : title;
        tv_middle.setText(title);

        if (title.equals("邀请消息")) {
            tv_no_data_hint.setText("主人，你的粉丝已经等你很久了~");
            iv_no_data.setImageDrawable(getResources().getDrawable(R.drawable.ic_msg_invite_null));
        } else if (title.equals("资金消息")) {
            tv_no_data_hint.setText("主人，你难道不想支付宝鼓鼓的吗？");
            iv_no_data.setImageDrawable(getResources().getDrawable(R.drawable.ic_msg_capital_null));
        } else if (title.equals("订单消息")) {
            tv_no_data_hint.setText("主人，来一笔订单吧，求你了~");
            iv_no_data.setImageDrawable(getResources().getDrawable(R.drawable.ic_msg_order_null));
        } else if (title.equals("其它消息") || title.equals("账号消息")) {
            tv_no_data_hint.setText("主人，我这里空空如也~");
            iv_no_data.setImageDrawable(getResources().getDrawable(R.drawable.ic_msg_other_null));
        } else {
            tv_no_data_hint.setText("暂无消息");
        }

        MessageCustomEvent.msgItemClick(UserMessageActivity.this, title);
        mList = new ArrayList<>();
        adapter = new UserMessageAdapter(this, mList, new IDeleteMessageListener() {

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

@@ -192,8 +192,6 @@
        ll_no_data = findViewById(R.id.ll_no_data);
        ll_request_failture = findViewById(R.id.ll_request_failture);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        tv_no_data_hint.setText("我是你的账户小管家，赶快去省钱吧~");
        iv_no_data.setImageResource(R.drawable.ic_account_desc_null);
        tv_middle.setText("账户明细");
//        tv_right.setText("筛选");
        tv_right.setVisibility(View.GONE);

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

@@ -150,7 +150,7 @@
    protected void onResume() {
        super.onResume();
        SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
        islogin = sp.getBoolean("isLogin", false);//是否登陆
        islogin =UserUtil.isLogin(getApplicationContext());
        uid = UserUtil.getUid(ShoppingApplication.application);

        if (iv_close.getContext() != null && wxonclick && islogin) { //判断是否 点击微信授权激活

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

@@ -124,7 +124,6 @@
        }
        getUserMoneyStatistic();
        SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
        boolean isLogin = sp.getBoolean("isLogin", false);
    }

    private void getAppPageNotification() {

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

@@ -101,8 +101,6 @@
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);

        tv_no_data_hint.setText("不会吧，没有你喜欢的商品吗");
        iv_no_data.setImageResource(R.drawable.ic_collect_null);

        iv_slid_top.setOnClickListener(this);
        ll_delete.setVisibility(View.GONE);

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

@@ -285,7 +285,7 @@
            break;
            case R.id.tv_order_appeal_aout://自动找回
                SharedPreferences sp = getContext().getSharedPreferences("user", Context.MODE_PRIVATE);
                boolean isLogin = sp.getBoolean("isLogin", false);
                boolean isLogin = UserUtil.isLogin(getContext());
                if (isLogin) {
                    if (!btimer) {
                        if (AlibcLogin.getInstance().isLogin()) {

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

@@ -135,8 +135,6 @@
        ll_request_failture = findViewById(R.id.ll_request_failture);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);
        tv_no_data_hint.setText("没有金币记录");
        iv_no_data.setImageResource(R.drawable.ic_msg_other_null);

        tv_middle.setText("金币明细");
        initPopubWindow();

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

@@ -77,8 +77,6 @@
        ll_request_failture = findViewById(R.id.ll_request_failture);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);
        tv_no_data_hint.setText("告诉你一个秘密，红包送得多粉丝来得多哦~");
        iv_no_data.setImageDrawable(getResources().getDrawable(R.drawable.ic_no_hongbao_send_record));
        findViewById(R.id.tv_net_setting).setOnClickListener(this);
        findViewById(R.id.tv_refresh).setOnClickListener(this);


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

@@ -224,7 +224,7 @@
        Log.i(TAG, "onResume");
        MobclickAgent.onResume(this);
        SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
        boolean isLogin = sp.getBoolean("isLogin", false);
        boolean isLogin =UserUtil.isLogin(getApplicationContext());
        if (isLogin) {//用户已经登录
        } else {
        }

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

@@ -308,6 +308,9 @@
        mAquery.id(R.id.iv_close).clicked(this);
        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);


        et_mobile_num.addTextChangedListener(new TextWatcher() {
            @Override
            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
@@ -522,6 +525,9 @@
                }
                break;

            case R.id.tv_agree:
                mAquery.id(R.id.cb_agree).checked(!mAquery.id(R.id.cb_agree).isChecked());
                break;
        }
    }


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

@@ -45,9 +45,9 @@
 */

public class LoginVerifyCodeActivity extends Activity implements View.OnClickListener {
    private ImageView iv_close, iv_contact_kefu;
    private ImageView iv_close;
    private TextView tv_mobile_num, tv_count_down, tv_count_down_hint, tv_not_received_sms,
            tv_input_error, tv_top_hint;
            tv_input_error, tv_top_hint,tv_help;
    private VerifyCodeViewShowLine et_verify_code_num;
    LinearLayout ll_verify_code_error;
    Long uid;
@@ -72,7 +72,7 @@

    private void init() {
        iv_close = findViewById(R.id.iv_close);
        iv_contact_kefu = findViewById(R.id.iv_contact_kefu);
        tv_help = findViewById(R.id.tv_help);
        tv_mobile_num = findViewById(R.id.tv_mobile_num);
        tv_count_down = findViewById(R.id.tv_count_down);
        tv_count_down_hint = findViewById(R.id.tv_count_down_hint);
@@ -96,7 +96,7 @@

    private void addListener() {
        iv_close.setOnClickListener(this);
        iv_contact_kefu.setOnClickListener(this);
        tv_help.setOnClickListener(this);
        tv_count_down.setOnClickListener(this);
        tv_not_received_sms.setOnClickListener(this);
        et_verify_code_num.setInputCompleteListener(new VerifyCodeViewShowLine.InputCompleteListener() {
@@ -141,7 +141,7 @@
            case R.id.iv_close:
                finish();
                break;
            case R.id.iv_contact_kefu:
            case R.id.tv_help:
                KeFuUtil.jumpKeFu(LoginVerifyCodeActivity.this, "验证码输入");
                break;
            case R.id.tv_not_received_sms://信息没有收到

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

@@ -118,8 +118,6 @@
        ll_request_failture = findViewById(R.id.ll_request_failture);
        findViewById(R.id.tv_net_setting).setOnClickListener(this);
        findViewById(R.id.tv_refresh).setOnClickListener(this);
        tv_no_data_hint.setText("快去浏览喜欢的商品吧~");
        iv_no_data.setImageResource(R.drawable.ic_footmark_null);

        float hRatio = 260 / 720f;
        float wRatio = 23 / 720f;

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

@@ -108,8 +108,6 @@

        tv_middle.setText("历史详情");

        tv_no_data_hint.setText("暂无数据~");
        iv_no_data.setImageResource(R.drawable.ic_account_desc_null);

        mList = new ArrayList<>();
        adapter = new MyMoneyHistoryDetailAdapter(this, mList, new MyMoneyHistoryDetailActivity.IDateSlectListener() {

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

@@ -182,8 +182,6 @@
        ll_request_failture = findViewById(R.id.ll_request_failture);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);
        tv_no_data_hint.setText("快去寻找你的粉丝吧~");
        iv_no_data.setImageDrawable(getResources().getDrawable(R.drawable.ic_no_friends));
        findViewById(R.id.tv_net_setting).setOnClickListener(this);
        findViewById(R.id.tv_refresh).setOnClickListener(this);
        mChangeHelper = new ConnectivityChangeHelper(this,

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

@@ -69,8 +69,6 @@
        ll_no_data = findViewById(R.id.ll_no_data);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);
        iv_no_data.setImageResource(R.drawable.ic_order_search_null);
        tv_no_data_hint.setText("暂无搜索记录~");
    }

    private void addListener() {

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

@@ -177,8 +177,6 @@
        ll_request_failture = findViewById(R.id.ll_request_failture);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);
        tv_no_data_hint.setText("未找到符合筛选条件的粉丝~");
        iv_no_data.setImageDrawable(getResources().getDrawable(R.drawable.ic_search_no_firends));
        findViewById(R.id.tv_net_setting).setOnClickListener(this);
        findViewById(R.id.tv_refresh).setOnClickListener(this);
        mChangeHelper = new ConnectivityChangeHelper(this,

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

@@ -141,21 +141,6 @@
                viewHolder.ll_no_data.setVisibility(View.VISIBLE);
                viewHolder.tv_place_order_time.setVisibility(View.GONE);
                viewHolder.ll_content.setVisibility(View.GONE);
                if (rewardState == null) {
                    viewHolder.tv_no_data_hint.setText("主人，暂时没有查询到订单~~");
                    viewHolder.iv_no_data.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_msg_order_null));
                } else {
                    if (rewardState == 1) {
                        viewHolder.tv_no_data_hint.setText("糟糕，你还没有订单，感觉\n损失了一个亿~");
                        viewHolder.iv_no_data.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_msg_order_null_valid));
                    } else if (rewardState == 2) {
                        viewHolder.tv_no_data_hint.setText("主人，恭喜你！购物体验很nice。");
                        viewHolder.iv_no_data.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_msg_order_null_weiquan));
                    } else {
                        viewHolder.tv_no_data_hint.setText("主人，暂时没有查询到订单~~");
                        viewHolder.iv_no_data.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_msg_order_null));
                    }
                }
                viewHolder.tv_no_data_hint.setGravity(Gravity.CENTER_HORIZONTAL);

            } else {

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

@@ -75,8 +75,6 @@
        ll_request_failture = findViewById(R.id.ll_request_failture);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);
        tv_no_data_hint.setText("没有订单找回记录哟~");
        iv_no_data.setImageDrawable(getResources().getDrawable(R.drawable.ic_msg_order_null));
        findViewById(R.id.tv_net_setting).setOnClickListener(this);
        findViewById(R.id.tv_refresh).setOnClickListener(this);


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

@@ -83,8 +83,6 @@
        ll_no_data = findViewById(R.id.ll_no_data);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);
        iv_no_data.setImageResource(R.drawable.ic_order_search_null);
        tv_no_data_hint.setText("暂无搜索记录~");
    }

    private void addListener() {

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

@@ -107,8 +107,6 @@
        ll_no_data = findViewById(R.id.ll_no_data);
        iv_no_data = findViewById(R.id.iv_no_data);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        tv_no_data_hint.setText("主人，暂时没有查询到该订单~");
        iv_no_data.setImageResource(R.drawable.ic_msg_order_null);

        rl_order_fillter.setColorSchemeColors(getResources().getColor(R.color.theme));
        rv_order_fillter.setAdapter(adapter);

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

@@ -111,8 +111,6 @@
        ll_request_failture = contentView.findViewById(R.id.ll_request_failture);
        tv_no_data_hint = contentView.findViewById(R.id.tv_no_data_hint);
        iv_no_data = contentView.findViewById(R.id.iv_no_data);
        tv_no_data_hint.setText("TA很懒，还没有粉丝！");
        iv_no_data.setImageDrawable(getResources().getDrawable(R.drawable.ic_no_friends));
        contentView.findViewById(R.id.tv_net_setting).setOnClickListener(this);
        contentView.findViewById(R.id.tv_refresh).setOnClickListener(this);


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

@@ -117,11 +117,8 @@
        ll_no_net = findViewById(R.id.ll_no_net);
        ll_no_data = findViewById(R.id.ll_no_data);
        ll_request_failture = findViewById(R.id.ll_request_failture);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        tv_no_data_hint.setText("红包有大用处哦~");
        tv_middle.setText("红包明细");
        iv_no_data = findViewById(R.id.iv_no_data);
        iv_no_data.setImageResource(R.drawable.ic_redpacket_desc_null);
    }

    private ImageView iv_no_data;

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

@@ -105,8 +105,6 @@
        ll_request_failture = findViewById(R.id.ll_request_failture);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);
        iv_no_data.setImageResource(R.drawable.ic_pushrecommend_history_empty);
        tv_no_data_hint.setText("还没有推荐记录哟~~");
        findViewById(R.id.tv_net_setting).setOnClickListener(this);
        findViewById(R.id.tv_refresh).setOnClickListener(this);


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

@@ -132,16 +132,6 @@
                viewHolder.ll_no_data.setVisibility(View.VISIBLE);
                viewHolder.tv_place_order_time.setVisibility(View.GONE);
                viewHolder.ll_content.setVisibility(View.GONE);
                if (rewardState == 1) {
                    viewHolder.tv_no_data_hint.setText("糟糕，你还没有订单，感觉\n损失了一个亿~");
                    viewHolder.iv_no_data.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_msg_order_null_valid));
                } else if (rewardState == 2) {
                    viewHolder.tv_no_data_hint.setText("主人，恭喜你！购物体验很nice。");
                    viewHolder.iv_no_data.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_msg_order_null_weiquan));
                } else {
                    viewHolder.tv_no_data_hint.setText("主人，暂时没有查询到订单~~");
                    viewHolder.iv_no_data.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_msg_order_null));
                }
                viewHolder.tv_no_data_hint.setGravity(Gravity.CENTER_HORIZONTAL);

            } else {

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

@@ -99,8 +99,6 @@

        tv_middle.setText("提现记录");

        tv_no_data_hint.setText("暂无提现记录~");
        iv_no_data.setImageResource(R.drawable.ic_account_desc_null);

        mList = new ArrayList<>();
        adapter = new WithdrawRecordAdapter(this, mList);

 app/src/main/java/com/tejia/lijin/app/ui/mine/money/TeamMoneyStatisticActivity.java

@@ -56,7 +56,6 @@
        ll_request_failture = findViewById(R.id.ll_request_failture);
        tv_no_data_hint = findViewById(R.id.tv_no_data_hint);
        iv_no_data = findViewById(R.id.iv_no_data);
        iv_no_data.setImageResource(R.drawable.ic_account_desc_null);
        tv_no_data_hint.setGravity(Gravity.CENTER);
        findViewById(R.id.tv_net_setting).setOnClickListener(this);
        findViewById(R.id.tv_refresh).setOnClickListener(this);
@@ -109,13 +108,10 @@
        int type = getIntent().getIntExtra("type", 0);
        if (type == 1) {
            tv_middle.setText("团队奖励");
            tv_no_data_hint.setText("只有你是超级会员且把直接或间接\n粉丝培养成超级会员后，才可以获\n得团队奖励哦！");
        } else if (type == 2) {
            tv_middle.setText("团队补贴");
            tv_no_data_hint.setText("只有升级为会员才有团队补贴哦，\n你暂未满足。");
        } else if (type == 3) {
            tv_middle.setText("导师津贴");
            tv_no_data_hint.setText("只有升级为导师才有导师津贴哦，\n你暂未满足。");
        }
        final ShapeLoadingDialog pb = new ShapeLoadingDialog.Builder(this).build();


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

@@ -6,6 +6,7 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.GradientDrawable;
@@ -371,7 +372,7 @@
            @Override
            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
                super.onScrolled(recyclerView, dx, dy);
//                //显示区域的高度。
//                //显示区域的宽。
                int extent = rv_special_offer.computeHorizontalScrollExtent();
                //整体的高度，注意是整体，包括在显示区域之外的。
                int range = rv_special_offer.computeHorizontalScrollRange();
@@ -700,13 +701,7 @@
                        circleSpecials.addAll(list2);
                        specialAdapter2.notifyDataSetChanged();

                        if (circleSpecials.size() > 10) {
                            GradientDrawable gradientDrawable = (GradientDrawable) seekBar.getThumb();
                            //根据列表的个数，动态设置游标的大小，设置游标的时候，progress进度的颜色设置为和seekbar的颜色设置的一样的，所以就不显示进度了。
                            gradientDrawable.setSize(DimenUtils.dip2px(getContext(), 50) * 5 / (circleSpecials.size() / 2)
                                    , DimenUtils.dip2px(getContext(), 4));
                        }
                        seekBar.setVisibility(circleSpecials.size() <= 8 ? View.GONE : View.VISIBLE);
                        initSeekBar();

                        if (list2 == null || list2.size() == 0) {
                            rv_special_offer.setVisibility(View.GONE);
@@ -908,6 +903,16 @@
        sv_hot.removeCallbacks(mAutoScroller3);
    }

    private void initSeekBar(){
        seekBar.setVisibility(circleSpecials.size() <= 8 ? View.GONE : View.VISIBLE);
        if (circleSpecials.size() > 8) {
            GradientDrawable gradientDrawable = (GradientDrawable) seekBar.getThumb();
            //根据列表的个数，动态设置游标的大小，设置游标的时候，progress进度的颜色设置为和seekbar的颜色设置的一样的，所以就不显示进度了。
            gradientDrawable.setSize(DimenUtils.dip2px(getContext(), 50) * 4 / (circleSpecials.size() / 2)
                    , DimenUtils.dip2px(getContext(), 4));
        }
    }


    private void setGoodsIndex() {
        if (pd == null) {
@@ -960,13 +965,7 @@
                    }
                    circleSpecials.addAll(list2);
                    specialAdapter2.notifyDataSetChanged();
                    seekBar.setVisibility(circleSpecials.size() <= 8 ? View.GONE : View.VISIBLE);
                    if (circleSpecials.size() > 10) {
                        GradientDrawable gradientDrawable = (GradientDrawable) seekBar.getThumb();
                        //根据列表的个数，动态设置游标的大小，设置游标的时候，progress进度的颜色设置为和seekbar的颜色设置的一样的，所以就不显示进度了。
                        gradientDrawable.setSize(DimenUtils.dip2px(getContext(), 50) * 5 / (circleSpecials.size() / 2)
                                , DimenUtils.dip2px(getContext(), 4));
                    }
                    initSeekBar();
                    if (list2 == null || list2.size() == 0) {
                        rv_special_offer.setVisibility(View.GONE);
                    } else {
@@ -1288,30 +1287,33 @@
            int screenWidth = ScreenUtils.getScreenWidth(getContext());
            ViewGroup.MarginLayoutParams p1 = (ViewGroup.MarginLayoutParams) ((View) fl_fragment_activity.getParent()).getLayoutParams();

            int rowSpace=DimenUtils.dip2px(getContext(),10);
            int smallImageWidth;
            int bigImageWidth=screenWidth-p1.leftMargin-p1.rightMargin;
            float bigratio = 0.35f;
            float smallratio = 0.4571f;
            int rowSpace = DimenUtils.dip2px(getContext(), 10);
            int columnSpace = DimenUtils.dip2px(getContext(), 5);
            int bigImageWidth = screenWidth - p1.leftMargin - p1.rightMargin;
            int bigImageHeight = (int) (bigImageWidth * bigratio);
            int smallImageWidth = (bigImageWidth - columnSpace) / 2;
            int smallImageHeight = (int) (smallImageWidth * smallratio);

            float actTotalHeight = (screenWidth - DimenUtils.dip2px(getContext(), 20)) * 7 / 20;

            int actTotalHeight = bigImageHeight + rowSpace;
            for (int i = 0; i < mList.size(); i++) {
                if (i > 0 && i % 2 == 0) {
                    actTotalHeight += ((screenWidth / 2 - DimenUtils.dip2px(getContext(), 15))
                            * 16 / 35 + DimenUtils.dip2px(getContext(), 10));
                    actTotalHeight += smallImageHeight + rowSpace;
                }
            }
            FrameLayout.LayoutParams params0 = new FrameLayout.LayoutParams((int) (screenWidth -
                    DimenUtils.dip2px(getContext(), 20)), (int) actTotalHeight);
            FrameLayout.LayoutParams params0 = new FrameLayout.LayoutParams(bigImageWidth, FrameLayout.LayoutParams.WRAP_CONTENT);
            params0.leftMargin = DimenUtils.dip2px(getContext(), 0);
            params0.rightMargin = DimenUtils.dip2px(getContext(), 0);
            params0.topMargin = DimenUtils.dip2px(getContext(), 15);
            params0.bottomMargin = DimenUtils.dip2px(getContext(), 10);
            ll_fragment_activity.setLayoutParams(params0);
            if (ll_fragment_activity.getChildCount() > 0) {
                ll_fragment_activity.removeAllViews();
            }

            iv_activity_bg.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams
                    .MATCH_PARENT, (int) actTotalHeight + DimenUtils.dip2px(getContext(), 25)));
//            iv_activity_bg.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams
//                    .MATCH_PARENT, (int) actTotalHeight + DimenUtils.dip2px(getContext(), 25)));
//            Glide.with(getContext()).load(bottomPic).into(iv_activity_bg);

            for (int i = 0; i < mList.size(); i++) {
@@ -1319,8 +1321,8 @@
                    final SpecialOffer2 info = mList.get(i);
                    ImageView iv = new ImageView(getContext());
                    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
                            (int) (screenWidth - DimenUtils.dip2px(getContext(), 20)),
                            (int) (screenWidth - DimenUtils.dip2px(getContext(), 20)) * 7 / 20);
                            bigImageWidth,
                            bigImageHeight);
                    params.gravity = Gravity.TOP;
                    iv.setLayoutParams(params);
                    iv.setScaleType(ImageView.ScaleType.FIT_XY);
@@ -1337,6 +1339,9 @@
                } else {
                    if (i % 2 == 1) {
                        LinearLayout ll_img = new LinearLayout(getContext());
                        LinearLayout.LayoutParams p2 = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
                        p2.topMargin = rowSpace;
                        ll_img.setLayoutParams(p2);
                        ll_img.setOrientation(LinearLayout.HORIZONTAL);
                        for (int j = i; j < (i + 2); j++) {
                            if (j >= mList.size()) {
@@ -1344,15 +1349,13 @@
                            }

                            ImageView iv = new ImageView(getContext());
                            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams((int) screenWidth / 2 -
                                    (DimenUtils.dip2px(getContext(), 15)), (int) ((screenWidth / 2 -
                                    (DimenUtils.dip2px(getContext(), 15))) * 16 / 35));
                            params.topMargin = DimenUtils.dip2px(getContext(), 10);
                            if (j % 2 == 1) {
                                params.rightMargin = DimenUtils.dip2px(getContext(), 3);
                            } else {
                                params.leftMargin = DimenUtils.dip2px(getContext(), 3);
                            }
                            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(smallImageWidth, smallImageHeight);

//                            if (j % 2 == 1) {
//                                params.rightMargin = columnSpace / 2;
//                            } else {
//                                params.leftMargin = columnSpace / 2;
//                            }
                            iv.setLayoutParams(params);
                            Glide.with(getContext()).load(mList.get(j).getPicture()).into(iv);
                            final int k = j;
@@ -1364,6 +1367,13 @@
                                }
                            });
                            ll_img.addView(iv);
                            if (j % 2 == 1) {
                                View view = new View(getContext());
                                LinearLayout.LayoutParams p3 = new LinearLayout.LayoutParams(0, 1);
                                p3.weight = 1;
                                view.setLayoutParams(p3);
                                ll_img.addView(view);
                            }
                        }
                        ll_fragment_activity.addView(ll_img);
                    }

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

@@ -1,38 +1,28 @@
package com.tejia.lijin.app.ui.recommend;

import android.app.Activity;
import android.content.Context;
import android.content.Intent;

import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;

import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
import com.tejia.lijin.app.util.ui.HomeUIUtil;
import com.wpc.library.util.common.DimenUtils;
import com.tejia.lijin.app.R;
import com.tejia.lijin.app.entity.TaoBaoGoodsBrief;
import com.tejia.lijin.app.util.GlideRoundTransform;
import com.tejia.lijin.app.util.goods.GoodsDetailJumpUtil;
import com.tejia.lijin.app.util.goods.GoodsDetailListUtil;
import com.tejia.lijin.app.util.ui.GoodsRightViewHolder;
import com.tejia.lijin.app.util.ui.HomeUIUtil;

import java.util.List;

import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;

/**

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

@@ -106,9 +106,6 @@
        iv_close = contentView.findViewById(R.id.iv_left);
        tv_no_data_hint = contentView.findViewById(R.id.tv_no_data_hint);
        iv_no_data = contentView.findViewById(R.id.iv_no_data);
        tv_no_data_hint.setText("哎呀，最近没有什么活动哦~");
        iv_no_data.setImageDrawable(null);
        iv_no_data.setBackground(getActivity().getResources().getDrawable(R.drawable.iv_no_doings));
        /**小黄条*/
        getAppPageNotification();


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

@@ -80,8 +80,6 @@
        ll_request_failture = findViewById(R.id.ll_request_failture);
        findViewById(R.id.tv_net_setting).setOnClickListener(this);
        findViewById(R.id.tv_refresh).setOnClickListener(this);
        tv_no_data_hint.setText("糟糕，没有相关的文章额");
        iv_no_data.setImageResource(R.drawable.ic_college_article_null);
        ll_no_data = findViewById(R.id.ll_no_data);

        float hRatio = 260 / 720f;

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

@@ -3,19 +3,12 @@
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Paint;
import android.graphics.Color;
import android.graphics.Rect;

import androidx.annotation.NonNull;
import androidx.viewpager.widget.ViewPager;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import android.graphics.drawable.Drawable;
import android.text.Html;
import android.text.Layout;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.RelativeSizeSpan;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -32,13 +25,6 @@
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
import com.tejia.lijin.app.ui.recommend.GoodsDetailActivity;
import com.tejia.lijin.app.util.goods.GoodsDetailListUtil;
import com.tejia.lijin.app.util.ui.GoodsRightViewHolder;
import com.viewpagerindicator.CirclePageIndicator;
import com.wpc.library.util.SystemCommon;
import com.wpc.library.util.common.DimenUtils;
import com.wpc.library.widget.RatioLayout;
import com.tejia.lijin.app.R;
import com.tejia.lijin.app.entity.HomeBanner;
import com.tejia.lijin.app.entity.Label;
@@ -50,20 +36,33 @@
import com.tejia.lijin.app.entity.trends.SendCircleImageGoods;
import com.tejia.lijin.app.entity.trends.SendCircleUser;
import com.tejia.lijin.app.ui.invite.ShareBrowserActivity;
import com.tejia.lijin.app.ui.recommend.GoodsDetailActivity;
import com.tejia.lijin.app.ui.recommend.RecommendTopAdapter2;
import com.tejia.lijin.app.util.SetLabels;
import com.tejia.lijin.app.util.downutil.StringUtils;
import com.tejia.lijin.app.util.goods.GoodsDetailJumpUtil;
import com.tejia.lijin.app.util.goods.GoodsDetailListUtil;
import com.tejia.lijin.app.util.ui.GoodsRightViewHolder;
import com.tejia.lijin.app.util.ui.TextViewUtil;
import com.tejia.lijin.app.util.user.UserUtil;
import com.viewpagerindicator.CirclePageIndicator;
import com.wpc.library.util.SystemCommon;
import com.wpc.library.util.common.DimenUtils;
import com.wpc.library.widget.RatioLayout;

import java.util.ArrayList;
import java.util.List;

import androidx.annotation.NonNull;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;

/**
 * 发圈adapter
 */
public class SendCircleAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

    private static final String TAG = "SendCircleAdapter";
    private List<HomeBanner> mBannerList;
    private List<SendCircleContent> mContentList;
    private Activity mContext;
@@ -495,7 +494,7 @@

        public SendCircleContentAdapter(Context context, SendCircleContent content, int maxImgHeight, int maxImgWidth, CommentClickListener commentClickListener, ImgClickListener imgClickListener, int outPosition) {
            this.outPosition = outPosition;
            options = new RequestOptions().skipMemoryCache(false).centerCrop().placeholder(R.drawable.ic_send_circle_default).diskCacheStrategy(DiskCacheStrategy.ALL).error(R.drawable.ic_send_circle_default);
            options = new RequestOptions().skipMemoryCache(false).centerCrop().placeholder(R.color.send_circle_img_default_color).diskCacheStrategy(DiskCacheStrategy.ALL).error(R.color.send_circle_img_default_color);
            this.content = content;
            this.context = context;
            if (content.getImgList() != null)
@@ -732,11 +731,32 @@
                    holder.ll_tag.setVisibility(View.GONE);
                }


                holder.tv_content.setClickable(false);
                if (StringUtils.isNullOrEmpty(comment.getContent())) {
                    holder.ll_content.setVisibility(View.GONE);
                } else {
                    holder.ll_content.setVisibility(View.VISIBLE);
                    holder.tv_content.setText(comment.getContent());
                    String content = comment.getContent();
                    content += "<img src='icon_common_emoji_link' /> <a href='test:http://www.baidu.com'>这是个可以点击的链接</a> 测试12312312123";
                    holder.tv_content.setText(TextViewUtil.getClickableHtml(Html.fromHtml(content, new Html.ImageGetter() {
                        @Override
                        public Drawable getDrawable(String source) {
                            try {
                                int resId = context.getResources().getIdentifier(source, "drawable", context.getPackageName());
                                Drawable drawable = context.getResources().getDrawable(resId);
                                drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
                                return drawable;
                            } catch (Exception e) {
                                return null;
                            }
                        }
                    }, null), context, Color.parseColor("#586b95")));

                    holder.tv_content.setMovementMethod(LinkMovementMethod.getInstance());
                    holder.tv_content.setFocusable(false);
                    holder.tv_content.setClickable(false);
                    holder.tv_content.setLongClickable(false);
                }

                holder.tv_content.setMaxLines(6);
@@ -949,11 +969,10 @@
                }
                //判断是否为最后一行
                int currentRow = cposition / lineNum;
                int totalRow=smallImageCount%lineNum==0?smallImageCount/lineNum:smallImageCount/lineNum+1;
                if(currentRow+1==totalRow){
                int totalRow = smallImageCount % lineNum == 0 ? smallImageCount / lineNum : smallImageCount / lineNum + 1;
                if (currentRow + 1 == totalRow) {
                    outRect.bottom = space * 6;
                }



            } else if (position < largeImgCount + smallImageCount + goodsCount) {

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

@@ -136,14 +136,6 @@
        ll_notice.setVisibility(View.GONE);
        iv_close = contentView.findViewById(R.id.iv_left);
        tv_no_data_hint = contentView.findViewById(R.id.tv_no_data_hint);
        iv_no_data = contentView.findViewById(R.id.iv_no_data);
        if ("7".equalsIgnoreCase(cate)) {
            tv_no_data_hint.setText("哎呀，发圈内容都被抢光了~");
        } else if ("8".equalsIgnoreCase(cate)) {
            tv_no_data_hint.setText("哎呀，素材正在赶来的路上~");
        }
        iv_no_data.setImageDrawable(null);
        iv_no_data.setBackground(getActivity().getResources().getDrawable(R.drawable.iv_no_send_circle));
        /**小黄条*/
        getAppPageNotification();


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

@@ -95,6 +95,7 @@
                }
            });

            info.setComment("");
            //评论信息
            if (StringUtils.isNullOrEmpty(info.getComment())) {
                viewHolder.ll_comment_content.setVisibility(View.GONE);

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

@@ -107,9 +107,6 @@
        iv_close = contentView.findViewById(R.id.iv_close);
        tv_no_data_hint = contentView.findViewById(R.id.tv_no_data_hint);
        iv_no_data = contentView.findViewById(R.id.iv_no_data);
        tv_no_data_hint.setText("哎呀，最近没有什么活动哦~");
        iv_no_data.setImageDrawable(null);
        iv_no_data.setBackground(getActivity().getResources().getDrawable(R.drawable.iv_no_doings));
        /**小黄条*/
//        getAppPageNotification();


 app/src/main/java/com/tejia/lijin/app/util/goods/GoodsDetailListUtil.java

@@ -79,15 +79,15 @@
        String disCount = info.getMoneyInfo().getFinalMoney();
        if (info.isHasCoupon()) {
            if (StringUtils.isNullOrEmpty(disCount))
                disCount = "¥ " + info.getCouponPrice();
                disCount = "¥" + info.getCouponPrice();
            viewHolder.tv_coupon_amount.setVisibility(View.VISIBLE);
            viewHolder.tv_coupon_amount.setText("-¥ " + info.getCouponInfo().getAmount());
            viewHolder.tv_coupon_amount.setText("-¥" + info.getCouponInfo().getAmount());
        } else {
            if (StringUtils.isNullOrEmpty(disCount))
                if (info.getGoodsType() == Constant.GOODS_TYPE_VIP) {
                    disCount = "¥ " + info.getCouponPrice();
                    disCount = "¥" + info.getCouponPrice();
                } else
                    disCount = "¥ " + info.getZkPrice();
                    disCount = "¥" + info.getZkPrice();
            viewHolder.tv_coupon_amount.setVisibility(View.GONE);
        }


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

@@ -21,8 +21,17 @@
     * @param context
     * @return
     */
    public static CharSequence getClickableHtml(String html, Context context,Integer  color) {
    public static CharSequence getClickableHtml(String html, Context context, Integer color) {
        Spanned spannedHtml = Html.fromHtml(html);
        SpannableStringBuilder clickableHtmlBuilder = new SpannableStringBuilder(spannedHtml);
        URLSpan[] urls = clickableHtmlBuilder.getSpans(0, spannedHtml.length(), URLSpan.class);
        for (final URLSpan span : urls) {
            setLinkClickable(clickableHtmlBuilder, span, context, color);
        }
        return clickableHtmlBuilder;
    }

    public static CharSequence getClickableHtml(Spanned spannedHtml, Context context, Integer color) {
        SpannableStringBuilder clickableHtmlBuilder = new SpannableStringBuilder(spannedHtml);
        URLSpan[] urls = clickableHtmlBuilder.getSpans(0, spannedHtml.length(), URLSpan.class);
        for (final URLSpan span : urls) {
@@ -39,7 +48,7 @@
        int end = clickableHtmlBuilder.getSpanEnd(urlSpan);
        int flags = clickableHtmlBuilder.getSpanFlags(urlSpan);

        ClickableSpan clickableSpan = new ClickableSpan() {
        clickableHtmlBuilder.setSpan( new ClickableSpan() {
            public void onClick(View view) {
                context.startActivity(new Intent(context, ShareBrowserActivity.class).putExtra("url", urlSpan.getURL()));
            }
@@ -47,12 +56,11 @@
            public void updateDrawState(TextPaint ds) {
                if (linkColor != null)
                    ds.setColor(linkColor);
//                //设置是否要下划线
                //设置是否要下划线
                ds.setUnderlineText(false);
                ds.clearShadowLayer();
            }
        };
        clickableHtmlBuilder.setSpan(clickableSpan, start, end, flags);
        }, start, end, flags);
    }

}

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

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

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

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

 app/src/main/res/drawable-xhdpi/ic_multiple_unselected.png

 app/src/main/res/drawable-xhdpi/ic_no_net.png

 app/src/main/res/drawable-xhdpi/ic_splash_top.png

 app/src/main/res/drawable-xhdpi/icon_common_emoji_link.png

 app/src/main/res/drawable-xhdpi/icon_item_goods_coupon.png

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

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

    <corners android:radius="4dp" />
    <solid android:color="@color/recommend_limit_time" />
    <padding android:left="2dp" android:right="2dp" android:top="0dp" android:bottom="0dp" ></padding>
</shape>

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

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

    <stroke android:width="1dp" android:color="#59eaeaea" />
    <solid android:color="#EAEAEA" />
    <corners android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" />


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

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


        <TextView
            android:padding="8dp"
            android:id="@+id/tv_help"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -229,6 +230,7 @@
                android:button="@drawable/selector_login_agreement"></CheckBox>

            <TextView
                android:id="@+id/tv_agree"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"

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

@@ -19,14 +19,19 @@
            android:padding="8dp"
            android:src="@mipmap/ic_close_login" />

        <ImageView
            android:id="@+id/iv_contact_kefu"

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


    </FrameLayout>

    <ScrollView
@@ -45,9 +50,10 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="60dp"
                android:gravity="center"
                android:text="登录领券得返利，安全简单更省钱"
                android:textColor="@color/main_text_color"
                android:textSize="18sp" />
                android:text="立减购物 畅爽省钱"
                android:textColor="@color/login_main_text_color"
                android:textSize="24sp"
                android:textStyle="bold" />

            <TextView
                android:layout_width="wrap_content"
@@ -84,7 +90,7 @@
                    android:gravity="center"
                    android:inputType="number"
                    android:maxLength="4"
                    android:textColor="@color/main_text_color" />
                    android:textColor="@color/login_main_text_color" />

                <TextView
                    android:id="@+id/tv_input_error"
@@ -95,7 +101,7 @@
                    android:layout_marginTop="58dp"
                    android:background="@null"
                    android:text="验证码错误，重新输入"
                    android:textColor="@color/detail_sharelist_reward_num"
                    android:textColor="@color/login_main_text_color"
                    android:textSize="13sp"
                    android:visibility="invisible" />
            </FrameLayout>
@@ -123,7 +129,7 @@
                        android:layout_gravity="center"
                        android:background="@null"
                        android:text="60"
                        android:textColor="@color/main_text_color"
                        android:textColor="@color/login_main_text_color"
                        android:textSize="13sp"
                        android:visibility="visible" />


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

@@ -41,8 +41,6 @@
                        android:id="@+id/rl_search"
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
                        android:layout_marginLeft="10dp"
                        android:layout_marginRight="10dp"
                        android:layout_weight="1">

                        <androidx.recyclerview.widget.RecyclerView

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

@@ -41,6 +41,8 @@
                    android:layout_gravity="right"
                    android:background="@drawable/shape_mine_msg_bg"
                    android:gravity="center"
                    android:layout_marginRight="2dp"
                    android:minWidth="16dp"
                    android:text="99+"
                    android:textColor="#ffff2a59"
                    android:textSize="10sp"
@@ -178,14 +180,14 @@
                            android:layout_width="53.5dp"
                            android:layout_height="12.5dp"
                            android:layout_marginTop="5dp"
                            app:rcv_bottomRightRadiu="12dp"
                            app:rcv_topLeftRadiu="12dp">
                            app:rcv_bottomRightRadiu="8dp"
                            app:rcv_topLeftRadiu="8dp">

                            <ImageView
                                android:id="@+id/iv_rank"
                                android:scaleType="fitXY"
                                android:layout_width="match_parent"
                                android:layout_height="match_parent"></ImageView>
                                android:layout_height="match_parent"
                                android:scaleType="fitXY"></ImageView>

                        </com.tejia.lijin.app.ui.subview.RadiusCardView>


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

@@ -3,38 +3,45 @@
    android:id="@+id/ll_request_failture"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/white"
    android:gravity="center"
    android:orientation="vertical"
    android:background="@color/register_gray"
    android:visibility="gone">

    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

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

    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="10dp"
        android:textSize="15sp"
        android:textColor="@color/text_black_1"
        android:text="网络连接异常，请检测网络设置" />
        <ImageView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:src="@drawable/ic_no_net" />

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="bottom|center_horizontal"
            android:layout_marginBottom="30dp"
            android:text="哎呀，信号好像丢失了~"
            android:textColor="@color/gray"
            android:textSize="15sp" />

    </FrameLayout>


    <TextView
        android:id="@+id/tv_refresh"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:layout_marginTop="30dp"
        android:background="@drawable/shape_go_search"
        android:gravity="center"
        android:paddingBottom="5dp"
        android:paddingLeft="12dp"
        android:textSize="16sp"
        android:paddingRight="12dp"
        android:paddingTop="5dp"
        android:paddingRight="12dp"
        android:paddingBottom="5dp"
        android:text="设置网络"
        android:textColor="@color/white" />
        android:textColor="@color/white"
        android:textSize="16sp" />
</LinearLayout>

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

@@ -56,7 +56,7 @@

            <FrameLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_height="130dp"
                android:layout_marginLeft="10dp"
                android:layout_weight="1">


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

@@ -3,7 +3,7 @@
    android:id="@+id/ll_no_data"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/page_bg_color"
    android:background="@color/white"
    android:gravity="center"
    android:orientation="vertical"
    android:visibility="gone">

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

@@ -3,32 +3,39 @@
    android:id="@+id/ll_no_net"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/register_gray"
    android:background="@color/white"
    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_no_net" />
    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="10dp"
        android:textSize="15sp"
        android:textColor="@color/text_black_1"
        android:text="请检查你的网络，重新加载吧~" />

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

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="bottom|center_horizontal"
            android:layout_marginBottom="30dp"
            android:text="哎呀，信号好像丢失了~"
            android:textColor="@color/gray"
            android:textSize="15sp" />

    </FrameLayout>

    <TextView
        android:id="@+id/tv_net_setting"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:layout_marginTop="30dp"
        android:background="@drawable/shape_go_search"
        android:gravity="center"
        android:paddingBottom="5dp"

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

@@ -65,8 +65,7 @@
            android:id="@+id/fl_fragment_activity"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"

            android:layout_marginBottom="10dp"
            android:paddingBottom="15dp"
            android:visibility="gone">

            <ImageView
@@ -158,6 +157,7 @@
            android:visibility="gone"></LinearLayout>

        <LinearLayout
            android:visibility="gone"
            android:id="@+id/ll_limit_time_and_exchange"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"

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

@@ -65,6 +65,7 @@
            android:background="@null"
            android:ellipsize="end"
            android:maxLines="6"
            android:autoLink="none"
            android:text="12321223"
            android:textColor="#333333"
            android:textSize="13sp"></TextView>

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

@@ -22,12 +22,7 @@
                android:background="@drawable/shape_img_bg" />
            <!-- 大图 -->

            <androidx.cardview.widget.CardView
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:layout_gravity="center_vertical"
                app:cardCornerRadius="5dp"
                app:cardElevation="0dp">


<!--                android:scaleType="centerCrop"-->

@@ -37,7 +32,7 @@
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"></ImageView>

            </androidx.cardview.widget.CardView>

            <!--券信息 -->
            <LinearLayout
                android:id="@+id/ll_coupon_bg"

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

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/item_trends2"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
@@ -18,89 +19,99 @@
            android:layout_height="match_parent"
            android:scaleType="centerCrop" />

        <androidx.appcompat.widget.LinearLayoutCompat
        <com.tejia.lijin.app.ui.subview.RadiusCardView
            android:layout_width="wrap_content"
            android:layout_height="25dp"
            android:layout_gravity="bottom|right"
            android:paddingRight="5dp"
            android:paddingLeft="5dp"
            android:background="#90000000">
            app:rcv_topLeftRadiu="10dp">

            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"
                android:text="剩："
                android:textColor="#ffffffff"
                android:textSize="14sp" />

            <TextView
                android:id="@+id/item_trends2_days"
            <androidx.appcompat.widget.LinearLayoutCompat
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"
                android:background="@color/recommend_limit_time"
                android:padding="2dp"
                android:text="05"
                android:textColor="#ffffffff"
                android:textSize="11sp" />
                android:layout_height="match_parent"
                android:background="#80000000"
                android:paddingLeft="5dp"
                android:paddingRight="5dp">

            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"
                android:layout_marginLeft="3dp"
                android:text="天"
                android:textColor="#ffffffff"
                android:textSize="11sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
                    android:text="剩："
                    android:textColor="#ffffffff"
                    android:textSize="14sp" />

            <TextView
                android:id="@+id/item_trends2_hours"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"
                android:layout_marginLeft="3dp"
                android:background="@color/recommend_limit_time"
                android:padding="2dp"
                android:text="20"
                android:textColor="#ffffffff"
                android:textSize="11sp" />
                <TextView
                    android:id="@+id/item_trends2_days"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
                    android:background="@drawable/shape_recommend_limit_time"
                    android:text="05"
                    android:textColor="#ffffffff"
                    android:textSize="11sp"
                    android:textStyle="bold" />

            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"
                android:layout_marginLeft="3dp"
                android:text="时"
                android:textColor="#ffffffff"
                android:textSize="11sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
                    android:layout_marginLeft="3dp"
                    android:text="天"
                    android:textColor="#ffffffff"
                    android:textSize="11sp" />

            <TextView
                android:id="@+id/item_trends2_min"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"
                android:layout_marginLeft="3dp"
                android:background="@color/recommend_limit_time"
                android:padding="2dp"
                android:text="20"
                android:textColor="#ffffffff"
                android:textSize="11sp" />
                <TextView
                    android:id="@+id/item_trends2_hours"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
                    android:layout_marginLeft="3dp"
                    android:background="@drawable/shape_recommend_limit_time"
                    android:text="20"
                    android:textColor="#ffffffff"
                    android:textSize="11sp"
                    android:textStyle="bold" />

            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"
                android:layout_marginLeft="3dp"
                android:text="分"
                android:textColor="#ffffffff"
                android:textSize="11sp" />
        </androidx.appcompat.widget.LinearLayoutCompat>
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
                    android:layout_marginLeft="3dp"
                    android:text="时"
                    android:textColor="#ffffffff"
                    android:textSize="11sp" />

                <TextView
                    android:id="@+id/item_trends2_min"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
                    android:layout_marginLeft="3dp"
                    android:background="@drawable/shape_recommend_limit_time"
                    android:text="20"
                    android:textColor="#ffffffff"
                    android:textSize="11sp"
                    android:textStyle="bold" />

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
                    android:layout_marginLeft="3dp"
                    android:text="分"
                    android:textColor="#ffffffff"
                    android:textSize="11sp" />
            </androidx.appcompat.widget.LinearLayoutCompat>

        </com.tejia.lijin.app.ui.subview.RadiusCardView>
    </FrameLayout>


    <FrameLayout
        android:layout_width="match_parent"
        android:paddingTop="8dp"
        android:paddingBottom="8dp"
        android:layout_height="wrap_content">

        <LinearLayout
@@ -110,8 +121,7 @@

            <androidx.appcompat.widget.LinearLayoutCompat
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="10dp">
                android:layout_height="wrap_content">

                <ImageView
                    android:id="@+id/item_trends2_imgmin"
@@ -119,14 +129,15 @@
                    android:layout_height="23dp"
                    android:layout_marginLeft="10dp"
                    android:background="@drawable/ic_hot2"
                    android:padding="2dp" />
                    android:padding="2dp"
                    android:visibility="gone" />

                <TextView
                    android:id="@+id/item_trends2_title"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
                    android:layout_marginLeft="5dp"
                    android:layout_marginLeft="10dp"
                    android:text="秋冬焕新-运动会啊品质专场"
                    android:textColor="#ff333333"
                    android:textSize="18sp"
@@ -139,7 +150,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginLeft="10dp"
                android:layout_marginTop="6dp"
                android:layout_marginTop="2dp"
                android:text="2折起 9.9活动聚划算"
                android:textColor="#ff999999"
                android:textSize="13sp" />
@@ -150,6 +161,7 @@
                android:layout_height="wrap_content"
                android:layout_marginLeft="10dp"
                android:layout_marginTop="8dp"
                android:visibility="gone"
                android:orientation="horizontal" />

        </LinearLayout>
@@ -172,7 +184,8 @@
        android:layout_marginRight="6dp"
        android:background="@drawable/shape_send_circle_recommend_bg"
        android:orientation="vertical"
        android:padding="5dp">
        android:padding="5dp"
        android:visibility="gone">

        <TextView
            android:id="@+id/tv_comment_content"
@@ -188,7 +201,6 @@
        <FrameLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content">



            <ImageView

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

@@ -20,17 +20,20 @@
            android:drawableTop="@drawable/selector_nav_recommend"
            android:text="@string/recommend" />

        <RadioButton
            android:id="@+id/rb_nav_hot_sale"
            style="@style/navItemStyle"
            android:drawableTop="@drawable/selector_nav_hot_sale"
            android:text="热卖" />

        <RadioButton
            android:id="@+id/rb_nav_better_goods"
            style="@style/navItemStyle"
            android:drawableTop="@drawable/selector_nav_better_goods"
            android:text="好物" />

        <RadioButton
            android:id="@+id/rb_nav_hot_sale"
            style="@style/navItemStyle"
            android:drawableTop="@drawable/selector_nav_hot_sale"
            android:text="热卖" />




        <RadioButton
@@ -45,6 +48,7 @@
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:orientation="horizontal"
        android:paddingTop="2dp"
        android:paddingBottom="5dp">

        <View
@@ -66,14 +70,22 @@
            android:layout_height="1px"
            android:layout_weight="1.7"
            android:visibility="invisible" />
        <!--我的红点-->
        <ImageView
            android:id="@+id/tv_msg_num2"
            android:layout_width="6dp"
            android:layout_height="6dp"
            android:layout_marginTop="3dp"
            android:layout_marginRight="20dp"
            android:src="@drawable/ic_msg_red_point"


        <TextView
            android:layout_marginRight="25dp"
            android:id="@+id/tv_msg_count"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="right"
            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" />


    </LinearLayout>
</FrameLayout>

 app/src/main/res/values/colors.xml

@@ -83,7 +83,7 @@
    <color name="gray9">#ffcccccc</color>
    <color name="gray10">#ffefefef</color>
    <color name="gray11">#ffacabab</color>
    <color name="recommend_limit_time">#ffff0000</color>
    <color name="recommend_limit_time">#D6001B</color>
    <color name="recommend_jinbi_exchange_bg">#ffFF8400</color>
    <color name="transport_register_gray3">#FFE8BB</color>
    <color name="yellow_gold2">#ff623700</color>
@@ -187,4 +187,12 @@

    <color name="capital_text_color">#4E2E00</color>
    <color name="capital_text_light_color">#AF864B</color>

    <color name="send_circle_img_default_color">#eaeaea</color>


    <!-- 登录 -->
    <color name="login_main_text_color">#FF2B4B</color>


</resources>