修改了布局、图标等

ybvideoandroid/app/src/main/AndroidManifest.xml

@@ -85,7 +85,7 @@
         android:name="com.yunbao.fqshortvideo.AppContext"
         android:allowBackup="true"
         android:extractNativeLibs="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/icon_app"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_config"

ybvideoandroid/common/src/main/java/com/yunbao/common/CommonAppConfig.java

@@ -32,7 +32,7 @@ import java.util.Map;
  */
 
 public class CommonAppConfig {
-    public static final String PACKAGE_NAME = "com.yunbao.shortvideo";
+    public static final String PACKAGE_NAME = "com.yunjing.fqshortvideo";
     public static final String FILE_PROVIDER = PACKAGE_NAME + ".fileprovider";
     //Http请求头 Header
     public static final Map<String, String> HEADER = new HashMap<>();
@@ -442,7 +442,7 @@ public class CommonAppConfig {
      */
     public int getAppIconRes() {
         if (mAppIconRes == 0) {
-            mAppIconRes = CommonAppContext.getInstance().getResources().getIdentifier("icon_app", "mipmap", "com.yunbao.shortvideo");
+            mAppIconRes = CommonAppContext.getInstance().getResources().getIdentifier("icon_app", "mipmap", "com.yunjing.fqshortvideo");
         }
         return mAppIconRes;
     }

ybvideoandroid/common/src/main/java/com/yunbao/common/activity/AbsActivity.java

@@ -156,6 +156,13 @@ public abstract class AbsActivity extends AppCompatActivity {
         mStatusBarColorWhite = isWhite;
         Window window = getWindow();
         window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+//        if (isWhite) {
+//            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+//        } else {
+////            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+//
+//            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+//        }
         if (isWhite) {
             window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
         } else {

ybvideoandroid/common/src/main/java/com/yunbao/common/utils/RouteUtil.java

@@ -91,27 +91,45 @@ public class RouteUtil {
      * 跳转到标提现
      */
     public static void forwardCash(Context context) {
-        Intent intent = new Intent();
-        intent.setClassName(CommonAppConfig.PACKAGE_NAME, "com.yunbao.main.activity.MyProfitActivity");
-        context.startActivity(intent);
+//        Intent intent = new Intent();
+//        intent.setClassName(CommonAppConfig.PACKAGE_NAME, "com.yunbao.main.activity.MyProfitActivity");
+//        context.startActivity(intent);
+        try {
+            Class<?> clazz = Class.forName("com.yunbao.main.activity.MyProfitActivity");
+            Intent intent = new Intent(context, clazz);
+            context.startActivity(intent);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     /**
      * 跳转到充值页面
      */
     public static void forwardMyCoin(Context context) {
-        Intent intent = new Intent();
-        intent.setClassName(CommonAppConfig.PACKAGE_NAME, "com.yunbao.main.activity.MyCoinActivity");
-        context.startActivity(intent);
+        try {
+            Class<?> clazz = Class.forName("com.yunbao.main.activity.MyCoinActivity");
+            Intent intent = new Intent(context, clazz);
+            context.startActivity(intent);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     /**
      * 跳转到VIP
      */
     public static void forwardVip(Context context) {
-        Intent intent = new Intent();
-        intent.setClassName(CommonAppConfig.PACKAGE_NAME, "com.yunbao.main.activity.VipActivity");
-        context.startActivity(intent);
+//        Intent intent = new Intent();
+//        intent.setClassName(CommonAppConfig.PACKAGE_NAME, "com.yunbao.main.activity.VipActivity");
+//        context.startActivity(intent);
+        try {
+            Class<?> clazz = Class.forName("com.yunbao.main.activity.VipActivity");
+            Intent intent = new Intent(context, clazz);
+            context.startActivity(intent);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
 

ybvideoandroid/common/src/main/res/layout/view_title.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/fl_top"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/background"
+    android:background="@color/white"
     android:paddingTop="19dp">
 
     <RelativeLayout
@@ -19,7 +20,7 @@
             android:gravity="center"
             android:paddingLeft="20dp"
             android:paddingRight="20dp"
-            android:textColor="@color/textColor"
+            android:textColor="@color/black"
             android:textSize="18sp"
             android:textStyle="bold" />
 
@@ -31,7 +32,7 @@
             android:onClick="backClick"
             android:padding="9dp"
             android:src="@mipmap/icon_back"
-            android:tint="@color/textColor" />
+            app:tint="@color/black" />
 
     </RelativeLayout>
 </FrameLayout>

ybvideoandroid/common/src/main/res/values-en-rUS/strings.xml

@@ -1637,4 +1637,6 @@
     <string name="platform_message">Platform Message</string>
     <!--    购物通知-->
     <string name="shopping_notice">Shopping Notice</string>
+    <!--    欢迎使用云镜直播-->
+    <string name="welcome_to_cloud_mirror">Welcome to Cloud Mirror</string>
 </resources>

ybvideoandroid/common/src/main/res/values/strings.xml

@@ -1642,4 +1642,6 @@
     <string name="platform_message">平台消息</string>
 <!--    购物通知-->
     <string name="shopping_notice">购物通知</string>
+<!--    欢迎使用云镜直播-->
+    <string name="welcome_to_cloud_mirror">欢迎使用云镜直播</string>
 </resources>

ybvideoandroid/main/src/main/AndroidManifest.xml

@@ -97,7 +97,8 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".activity.VipActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true"/>
         <activity
             android:name=".activity.CancelAccountActivity"
             android:screenOrientation="portrait" />

ybvideoandroid/main/src/main/java/com/yunbao/main/activity/LiveSquareActivity.java

@@ -82,8 +82,8 @@ public class LiveSquareActivity extends AbsActivity implements OnItemClickListen
             @Override
             public IPagerTitleView getTitleView(Context context, final int index) {
                 SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
-                simplePagerTitleView.setNormalColor(ContextCompat.getColor(mContext, com.yunbao.mall.R.color.gray3));
-                simplePagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, com.yunbao.mall.R.color.textColor));
+                simplePagerTitleView.setNormalColor(0xff666666);
+                simplePagerTitleView.setSelectedColor(0xff111111);
                 simplePagerTitleView.setText(mClassList.get(index).getName());
                 simplePagerTitleView.setTextSize(14);
                 simplePagerTitleView.setOnClickListener(new View.OnClickListener() {
@@ -109,7 +109,7 @@ public class LiveSquareActivity extends AbsActivity implements OnItemClickListen
                 linePagerIndicator.setXOffset(DpUtil.dp2px(5));
                 linePagerIndicator.setLineHeight(DpUtil.dp2px(2));
                 linePagerIndicator.setRoundRadius(DpUtil.dp2px(1));
-                linePagerIndicator.setColors(ContextCompat.getColor(mContext, R.color.white));
+                linePagerIndicator.setColors(0xff111111);
                 return linePagerIndicator;
             }
 

ybvideoandroid/main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -164,17 +164,18 @@ public class MainActivity extends AbsVideoPlayActivity implements TabButtonGroup
                         }
                     }
                 }
-                if (position == 0) {
+                changeStatusBarWhite(!true);
+//                if (position == 0) {
 //                    boolean mallChecked = mHomeViewHolder != null && mHomeViewHolder.getCurrentItem() == 3;
-                    boolean mallChecked = true;
-                    setBottomWhite(mallChecked);
-                    changeStatusBarWhite(!mallChecked);
-                } else {
+//                    boolean mallChecked = true;
+//                    setBottomWhite(mallChecked);
+//                    changeStatusBarWhite(!mallChecked);
+//                } else {
 //                    setBottomWhite(position != 1);
 //                    changeStatusBarWhite(position != 2 && position != 3);
-                    setBottomWhite(true);
-                    changeStatusBarWhite(true);
-                }
+//                    setBottomWhite(true);
+//                    changeStatusBarWhite(true);
+//                }
             }
 
             @Override
@@ -227,7 +228,7 @@ public class MainActivity extends AbsVideoPlayActivity implements TabButtonGroup
             if (!TextUtils.isEmpty(cityVal) && cityVal.length() < 3) {
                 mCityBtn.setText(cityVal);
             } else {
-                mCityBtn.setText(WordUtil.getString(R.string.main_city));
+                mCityBtn.setText(WordUtil.getString(R.string.main_shop));
             }
         }
     }
@@ -271,9 +272,8 @@ public class MainActivity extends AbsVideoPlayActivity implements TabButtonGroup
             }
         } else if (i == R.id.btn_search) {
             SearchActivity.forward(mContext, 1);
-        } else if (i == R.id.btn_menu) {
-//            这里改为侧滑 需要修改跳转
-//            LiveSquareActivity.forward(mContext);
+        } else if (i == R.id.btn_live_square) {
+            LiveSquareActivity.forward(mContext);
         }
     }
 

ybvideoandroid/main/src/main/java/com/yunbao/main/adapter/MainHomeNewsAdapter.java

@@ -1,34 +1,49 @@
-
 package com.yunbao.main.adapter;
 
 import android.content.Context;
-import android.graphics.drawable.Drawable;
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-import android.text.TextUtils;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.view.LayoutInflater;
-
-import com.yunbao.im.bean.ImConUserBean;
-import com.yunbao.main.R;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.yunbao.main.R;
 import com.yunbao.main.bean.NewsBean;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class MainHomeNewsAdapter extends RecyclerView.Adapter<MainHomeNewsAdapter.MainHomeNewsHolder> {
 
     private List<NewsBean> newsList;
+    private Context mContext;
+    private View.OnClickListener mOnClickListener;
+    private OnItemClickListener mItemClickListener;
 
     public MainHomeNewsAdapter(Context context) {
-        this.newsList = newsList == null ? new java.util.ArrayList<>() : newsList;
+        this.mContext = context;
+        this.newsList = new ArrayList<>();
+
+        mOnClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                int position = (int) v.getTag();
+                if (position >= 0 && position < newsList.size() && mItemClickListener != null) {
+                    mItemClickListener.onItemClick(newsList.get(position), position);
+                }
+            }
+        };
+    }
+
+    public interface OnItemClickListener {
+        void onItemClick(NewsBean bean, int position);
+    }
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        this.mItemClickListener = listener;
     }
 
     @NonNull
@@ -41,29 +56,43 @@ public class MainHomeNewsAdapter extends RecyclerView.Adapter<MainHomeNewsAdapte
     @Override
     public void onBindViewHolder(@NonNull MainHomeNewsHolder holder, int position) {
         NewsBean item = newsList.get(position);
+
         holder.mTitle.setText(item.getTitle());
-        holder.mTag.setText(item.getTag());
         holder.mDate.setText(item.getDate());
-//        holder.mNewsImg.
 
-        // 设置不同标签的背景颜色
+        // 设置标签样式
         String tag = item.getTag();
-//        设置mTag显示
-        holder.mTag.setVisibility(View.VISIBLE);
-        holder.mTag.setText(tag);
-        if ("平台公告".equals(tag)) {
-            holder.mTag.setBackgroundResource(R.drawable.bg_news_platform_announcement);
-            holder.mTag.setTextColor(0xFFFF5555);
-        } else if ("运营公告".equals(tag)) {
-            holder.mTag.setBackgroundResource(R.drawable.bg_news_operation_announcement);
-            holder.mTag.setTextColor(0xFF00AA00);
-        } else if ("当地新闻".equals(tag)) {
-            holder.mTag.setBackgroundResource(R.drawable.bg_news_local_news);
-            holder.mTag.setTextColor(0xFF0077FF);
+        if (tag != null && !tag.isEmpty()) {
+            holder.mTag.setVisibility(View.VISIBLE);
+            holder.mTag.setText(tag);
+
+            switch (tag) {
+                case "平台公告":
+                    holder.mTag.setBackgroundResource(R.drawable.bg_news_platform_announcement);
+                    holder.mTag.setTextColor(0xFFFF5555);
+                    break;
+                case "运营公告":
+                    holder.mTag.setBackgroundResource(R.drawable.bg_news_operation_announcement);
+                    holder.mTag.setTextColor(0xFF00AA00);
+                    break;
+                case "当地新闻":
+                    holder.mTag.setBackgroundResource(R.drawable.bg_news_local_news);
+                    holder.mTag.setTextColor(0xFF0077FF);
+                    break;
+                default:
+                    holder.mTag.setVisibility(View.GONE);
+                    break;
+            }
         } else {
-//            设置mTag不显示
             holder.mTag.setVisibility(View.GONE);
         }
+
+        // 设置点击事件
+        holder.itemView.setTag(position);
+        holder.itemView.setOnClickListener(mOnClickListener);
+
+        // 如果需要加载图片，可以解开注释并使用 Glide
+        // Glide.with(mContext).load(item.getImgUrl()).placeholder(R.drawable.placeholder).into(holder.mNewsImg);
     }
 
     @Override
@@ -79,7 +108,7 @@ public class MainHomeNewsAdapter extends RecyclerView.Adapter<MainHomeNewsAdapte
     }
 
     public void setList(List<NewsBean> list) {
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             newsList.clear();
             newsList.addAll(list);
             notifyDataSetChanged();
@@ -94,10 +123,10 @@ public class MainHomeNewsAdapter extends RecyclerView.Adapter<MainHomeNewsAdapte
 
         public MainHomeNewsHolder(View itemView) {
             super(itemView);
-            mTitle = (TextView)itemView.findViewById(R.id.title);
-            mTag = (TextView)itemView.findViewById(R.id.news_type);
-            mDate = (TextView)itemView.findViewById(R.id.time);
-            mNewsImg = (ImageView)itemView.findViewById(R.id.news_img);
+            mTitle = itemView.findViewById(R.id.title);
+            mTag = itemView.findViewById(R.id.news_type);
+            mDate = itemView.findViewById(R.id.time);
+            mNewsImg = itemView.findViewById(R.id.news_img);
         }
     }
-}
+}

ybvideoandroid/main/src/main/java/com/yunbao/main/views/MainHomeHotViewHolder.java

@@ -53,7 +53,7 @@ public class MainHomeHotViewHolder extends AbsVideoMainViewHolder implements OnI
     public void init() {
         mRefreshView = (CommonRefreshView) findViewById(R.id.refreshView);
         mRefreshView.setLayoutManager(new GridLayoutManager(mContext, 2, GridLayoutManager.VERTICAL, false));
-        ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 2, 0);
+        ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 10, 0);
         decoration.setOnlySetItemOffsetsButNoDraw(true);
         mRefreshView.setItemDecoration(decoration);
         mRefreshView.setDataHelper(new CommonRefreshView.DataHelper<VideoBean>() {

ybvideoandroid/main/src/main/java/com/yunbao/main/views/MainHomeNewsViewHolder.java

@@ -50,7 +50,13 @@ public class MainHomeNewsViewHolder extends AbsMainViewHolder {
         mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
         mAdapter = new MainHomeNewsAdapter(mContext);
-//        mAdapter.setActionListener(this);
+        mAdapter.setOnItemClickListener(new MainHomeNewsAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(NewsBean bean, int position) {
+                // 处理点击事件
+
+            }
+        });
         mRecyclerView.setAdapter(mAdapter);
     }
 
@@ -64,5 +70,8 @@ public class MainHomeNewsViewHolder extends AbsMainViewHolder {
         newsList.add(newsBean1);
         newsList.add(newsBean2);
         mAdapter.setList(newsList);
+        if (mSmartRefreshLayout != null) {
+            mSmartRefreshLayout.finishRefresh();
+        }
     }
 }

ybvideoandroid/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java

@@ -79,7 +79,7 @@ public class MainHomeViewHolder extends AbsMainViewHolder {
     public void init() {
         setStatusHeight();
         mBtnSearch = findViewById(R.id.btn_search);
-        mBtnLiveSquare = findViewById(R.id.btn_menu);
+        mBtnLiveSquare = findViewById(R.id.btn_live_square);
         mPagerTitleList = new ArrayList<>();
         mViewList = new ArrayList<>();
         mViewHolders = new ArrayList<>();
@@ -172,10 +172,12 @@ public class MainHomeViewHolder extends AbsMainViewHolder {
                 @Override
                 public IPagerTitleView getTitleView(Context context, final int index) {
                     MainHomePagerTitleView simplePagerTitleView = new MainHomePagerTitleView(context);
-                    simplePagerTitleView.setNormalColor(0xccffffff);
-                    simplePagerTitleView.setSelectedColor(0xffffffff);
+//                    simplePagerTitleView.setNormalColor(0xccffffff);
+//                    simplePagerTitleView.setSelectedColor(0xffffffff);
+                    simplePagerTitleView.setNormalColor(0xff666666);
+                    simplePagerTitleView.setSelectedColor(0xff111111);
                     simplePagerTitleView.setText(mClassBeanList.get(index).getName());
-                    simplePagerTitleView.setTextSize(17);
+                    simplePagerTitleView.setTextSize(18);
                     simplePagerTitleView.getPaint().setFakeBoldText(true);
                     simplePagerTitleView.setOnClickListener(new View.OnClickListener() {
                         @Override
@@ -187,7 +189,7 @@ public class MainHomeViewHolder extends AbsMainViewHolder {
                             if (CommonAppConfig.getInstance().isBaseFunctionMode()) {
                                 return;
                             }
-                            setIndicatorBlack(index == 3);
+//                            setIndicatorBlack(index == 3);
                             if (mViewPager != null) {
                                 mViewPager.setCurrentItem(index, false);
                             }
@@ -203,7 +205,8 @@ public class MainHomeViewHolder extends AbsMainViewHolder {
                     linePagerIndicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
                     linePagerIndicator.setXOffset(DpUtil.dp2px(5));
                     linePagerIndicator.setRoundRadius(DpUtil.dp2px(2));
-                    linePagerIndicator.setColors(0xffffffff);
+//                    linePagerIndicator.setColors(0xffffffff);
+                    linePagerIndicator.setColors(0xff111111);
                     mLinePagerIndicator = linePagerIndicator;
                     return linePagerIndicator;
                 }
@@ -252,7 +255,7 @@ public class MainHomeViewHolder extends AbsMainViewHolder {
 //                    vh = mMainMallViewHolder;
                 } else if (position == 4) {
                     mFollowViewHolder = new MainHomeFollowViewHolder(mContext, parent);
-//                  vh = mFollowViewHolder;
+                    vh = mFollowViewHolder;
                 } else if (position == 5) {
                     mFindViewHolder = new MainHomeFindViewHolder(mContext, parent);
                     vh = mFindViewHolder;
@@ -269,6 +272,7 @@ public class MainHomeViewHolder extends AbsMainViewHolder {
                 mViewHolders.set(position, vh);
                 vh.addToParent();
                 vh.subscribeActivityLifeCycle();
+
             }
         }
 
@@ -276,13 +280,13 @@ public class MainHomeViewHolder extends AbsMainViewHolder {
             vh.loadData();
         }
 //        boolean mallChecked = position == 3;
-//        MainActivity mainActivity = ((MainActivity) mContext);
+        MainActivity mainActivity = ((MainActivity) mContext);
 //        mainActivity.setBottomWhite(mallChecked);
 //        mainActivity.changeStatusBarWhite(!mallChecked);
-        boolean mallChecked = true;
-        MainActivity mainActivity = ((MainActivity) mContext);
-        mainActivity.setBottomWhite(mallChecked);
-        mainActivity.changeStatusBarWhite(!mallChecked);
+//        boolean mallChecked = true;
+//        MainActivity mainActivity = ((MainActivity) mContext);
+//        mainActivity.setBottomWhite(mallChecked);
+        mainActivity.changeStatusBarWhite(!true);
         for (int i = 0; i < mPagerTitleList.size(); i++) {
             mPagerTitleList.get(i).updateColor(i == position);
         }

ybvideoandroid/main/src/main/java/com/yunbao/main/views/MainMallViewHolder.java

@@ -55,6 +55,7 @@ import com.yunbao.main.http.MainHttpUtil;
 import com.yunbao.mall.activity.GoodsDetailActivity;
 import com.yunbao.mall.bean.GoodsHomeClassBean;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -146,6 +147,7 @@ public class MainMallViewHolder extends AbsMainViewHolder implements OnItemClick
                 }
                 mBannerList = bannerList;
                 mClassList = JSON.parseArray(obj.getString("shoptwoclass"), GoodsHomeClassBean.class);
+                mRecommendList = new ArrayList<MainMallGoodsBean>();
                 MainMallGoodsBean bean = new MainMallGoodsBean();
                 bean.setId("11");
                 bean.setName("乐山橙子");
@@ -396,17 +398,17 @@ public class MainMallViewHolder extends AbsMainViewHolder implements OnItemClick
         } else if (id == R.id.btn_normal_goods) {
             // 普通商品
             mNormalGoodsText.setTextColor(Color.parseColor("#303132"));
-            mNormalGoodsText.setTypeface(mNormalGoodsText.getTypeface(), Typeface.BOLD);
+//            mNormalGoodsText.setTypeface(mNormalGoodsText.getTypeface(), Typeface.BOLD);
             mNormalGoodsTip.setBackground(ContextCompat.getDrawable(mContext, R.drawable.bg_shop_hot_menu));
             mNormalGoodsTip.setTextColor(Color.parseColor("#ffffff"));
 
             mAgriculturalAssistanceText.setTextColor(Color.parseColor("#333333"));
-            mAgriculturalAssistanceText.setTypeface(mAgriculturalAssistanceText.getTypeface(), Typeface.NORMAL);
+//            mAgriculturalAssistanceText.setTypeface(mAgriculturalAssistanceText.getTypeface(), Typeface.NORMAL);
             mAgriculturalAssistanceTip.setBackground(null);
             mAgriculturalAssistanceTip.setTextColor(Color.parseColor("#999999"));
 
             mSpecialSeckillText.setTextColor(Color.parseColor("#333333"));
-            mSpecialSeckillText.setTypeface(mSpecialSeckillText.getTypeface(), Typeface.NORMAL);
+//            mSpecialSeckillText.setTypeface(mSpecialSeckillText.getTypeface(), Typeface.NORMAL);
             mSpecialSeckillTip.setBackground(null);
             mSpecialSeckillTip.setTextColor(Color.parseColor("#999999"));
 
@@ -414,34 +416,34 @@ public class MainMallViewHolder extends AbsMainViewHolder implements OnItemClick
         } else if (id == R.id.btn_agricultural_assistance) {
             // 助农特惠
             mAgriculturalAssistanceText.setTextColor(Color.parseColor("#303132"));
-            mAgriculturalAssistanceText.setTypeface(mAgriculturalAssistanceText.getTypeface(), Typeface.BOLD);
+//            mAgriculturalAssistanceText.setTypeface(mAgriculturalAssistanceText.getTypeface(), Typeface.BOLD);
             mAgriculturalAssistanceTip.setBackground(ContextCompat.getDrawable(mContext, R.drawable.bg_shop_hot_menu));
             mAgriculturalAssistanceTip.setTextColor(Color.parseColor("#ffffff"));
 
             mNormalGoodsText.setTextColor(Color.parseColor("#333333"));
-            mNormalGoodsText.setTypeface(mNormalGoodsText.getTypeface(), Typeface.NORMAL);
+//            mNormalGoodsText.setTypeface(mNormalGoodsText.getTypeface(), Typeface.NORMAL);
             mNormalGoodsTip.setBackground(null);
             mNormalGoodsTip.setTextColor(Color.parseColor("#999999"));
 
             mSpecialSeckillText.setTextColor(Color.parseColor("#333333"));
-            mSpecialSeckillText.setTypeface(mSpecialSeckillText.getTypeface(), Typeface.NORMAL);
+//            mSpecialSeckillText.setTypeface(mSpecialSeckillText.getTypeface(), Typeface.NORMAL);
             mSpecialSeckillTip.setBackground(null);
             mSpecialSeckillTip.setTextColor(Color.parseColor("#999999"));
             loadData();
         } else if (id == R.id.btn_special_seckill) {
             // 特价秒杀
             mSpecialSeckillText.setTextColor(Color.parseColor("#303132"));
-            mSpecialSeckillText.setTypeface(mSpecialSeckillText.getTypeface(), Typeface.BOLD);
+//            mSpecialSeckillText.setTypeface(mSpecialSeckillText.getTypeface(), Typeface.BOLD);
             mSpecialSeckillTip.setBackground(ContextCompat.getDrawable(mContext, R.drawable.bg_shop_hot_menu));
             mSpecialSeckillTip.setTextColor(Color.parseColor("#ffffff"));
 
             mNormalGoodsText.setTextColor(Color.parseColor("#333333"));
-            mNormalGoodsText.setTypeface(mNormalGoodsText.getTypeface(), Typeface.NORMAL);
+//            mNormalGoodsText.setTypeface(mNormalGoodsText.getTypeface(), Typeface.NORMAL);
             mNormalGoodsTip.setBackground(null);
             mNormalGoodsTip.setTextColor(Color.parseColor("#999999"));
 
             mAgriculturalAssistanceText.setTextColor(Color.parseColor("#333333"));
-            mAgriculturalAssistanceText.setTypeface(mAgriculturalAssistanceText.getTypeface(), Typeface.NORMAL);
+//            mAgriculturalAssistanceText.setTypeface(mAgriculturalAssistanceText.getTypeface(), Typeface.NORMAL);
             mAgriculturalAssistanceTip.setBackground(null);
             mAgriculturalAssistanceTip.setTextColor(Color.parseColor("#999999"));
             loadData();

ybvideoandroid/main/src/main/java/com/yunbao/main/views/UserHomeViewHolder.java

@@ -49,11 +49,13 @@ import com.yunbao.main.activity.FollowActivity;
 import com.yunbao.main.activity.GoodsCollectActivity;
 import com.yunbao.main.activity.LoginActivity;
 import com.yunbao.main.activity.NameCardActivity;
+import com.yunbao.main.activity.VideoWatchRecordActivity;
 import com.yunbao.main.bean.BonusBean;
 import com.yunbao.main.custom.UserHomePagerTitleView;
 import com.yunbao.main.http.MainHttpConsts;
 import com.yunbao.main.http.MainHttpUtil;
 import com.yunbao.mall.activity.BuyerActivity;
+import com.yunbao.mall.activity.BuyerOrderActivity;
 import com.yunbao.mall.activity.SellerActivity;
 import com.yunbao.mall.activity.ShopHomeActivity;
 
@@ -145,6 +147,9 @@ public class UserHomeViewHolder extends AbsMainViewHolder implements AppBarLayou
     private View mFollowYes;
     private View mFollowNo;
     private View btnChangeFollow;
+    private View btnWatchList;
+    private View btnWallet;
+    private View btnOrder;
 
 
     public UserHomeViewHolder(Context context, ViewGroup parentView, boolean fromLive) {
@@ -211,24 +216,30 @@ public class UserHomeViewHolder extends AbsMainViewHolder implements AppBarLayou
         mGroupShop = findViewById(R.id.group_shop);
         mGroupSelfShop = findViewById(R.id.group_self_shop);
         mGroupOtherShop = findViewById(R.id.group_other_shop);
-//        mGroupSelfEdit = findViewById(R.id.group_self_edit);
-//        mGroupOtherFollow = findViewById(R.id.group_other_follow);
-//        mFollowYes = findViewById(R.id.follow_yes);
-//        mFollowNo = findViewById(R.id.follow_no);
-//        btnChangeFollow = findViewById(R.id.btn_change_follow);
-//        mSignDay = findViewById(R.id.btn_sign_day);
+        mGroupSelfEdit = findViewById(R.id.group_self_edit);
+        mGroupOtherFollow = findViewById(R.id.group_other_follow);
+        mFollowYes = findViewById(R.id.follow_yes);
+        mFollowNo = findViewById(R.id.follow_no);
+        btnChangeFollow = findViewById(R.id.btn_change_follow);
+        mSignDay = findViewById(R.id.btn_sign_day);
+        btnWatchList = findViewById(R.id.btn_watchlist);
+        btnWallet = findViewById(R.id.btn_wallet);
+        btnOrder = findViewById(R.id.btn_order);
         findViewById(R.id.btn_shop_self).setOnClickListener(this);
-        findViewById(R.id.btn_collect).setOnClickListener(this);
+//        findViewById(R.id.btn_collect).setOnClickListener(this);
         mBtnLive.setOnClickListener(this);
-//        findViewById(R.id.btn_edit_profile).setOnClickListener(this);
+        findViewById(R.id.btn_edit_profile).setOnClickListener(this);
         mSignDay.setOnClickListener(this);
-//        findViewById(R.id.btn_change_follow).setOnClickListener(this);
+        findViewById(R.id.btn_change_follow).setOnClickListener(this);
         findViewById(R.id.btn_chat).setOnClickListener(this);
         mGroupAvatar.setOnClickListener(this);
         mBackWall.setOnClickListener(this);
         findViewById(R.id.btn_name_card).setOnClickListener(this);
         findViewById(R.id.btn_fans).setOnClickListener(this);
         findViewById(R.id.btn_follow).setOnClickListener(this);
+        findViewById(R.id.btn_watchlist).setOnClickListener(this);
+        findViewById(R.id.btn_wallet).setOnClickListener(this);
+        findViewById(R.id.btn_order).setOnClickListener(this);
         btnChangeFollow.setOnClickListener(this);
         mBtnShopOther.setOnClickListener(this);
         mViewPager = (ViewPager) findViewById(R.id.viewPager);
@@ -512,6 +523,7 @@ public class UserHomeViewHolder extends AbsMainViewHolder implements AppBarLayou
                 mGroupShop.setVisibility(View.VISIBLE);
             }
         }
+        mGroupShop.setVisibility(View.VISIBLE);
         if (mIsSelf) {
             PAGE_COUNT = 3;
             if (mGroupSelfEdit != null && mGroupSelfEdit.getVisibility() != View.VISIBLE) {
@@ -745,22 +757,40 @@ public class UserHomeViewHolder extends AbsMainViewHolder implements AppBarLayou
             WebViewActivity.forward(mContext, HtmlConfig.LIVE_RECORD + mToUid);
         } else if (i == R.id.btn_edit_profile) {
             EditProfileActivity.forward(mContext);
-//        } else if (i == R.id.btn_sign_day) {
-//            if (ClickUtil.canClick()) {
-//                requestBonus();//每日签到
-//            }
-//        } else if (i == R.id.btn_change_follow) {
-//            if (!CommonAppConfig.getInstance().isLogin()) {
-//                LoginActivity.forward(mContext);
-//                return;
-//            }
-//            follow();
+        } else if (i == R.id.btn_sign_day) {
+            if (ClickUtil.canClick()) {
+                requestBonus();//每日签到
+            }
+        } else if (i == R.id.btn_change_follow) {
+            if (!CommonAppConfig.getInstance().isLogin()) {
+                LoginActivity.forward(mContext);
+                return;
+            }
+            follow();
         } else if (i == R.id.btn_chat) {
             if (!CommonAppConfig.getInstance().isLogin()) {
                 LoginActivity.forward(mContext);
                 return;
             }
             ChatRoomActivity.forward(mContext, mUserBean, mUserBean.getIsattention() == 1);
+        } else if (i == R.id.btn_watchlist) {
+            if (!CommonAppConfig.getInstance().isLogin()) {
+                LoginActivity.forward(mContext);
+                return;
+            }
+            VideoWatchRecordActivity.forward(mContext);
+        } else if (i == R.id.btn_wallet) {
+            if (!CommonAppConfig.getInstance().isLogin()) {
+                LoginActivity.forward(mContext);
+                return;
+            }
+            RouteUtil.forwardMyCoin(mContext);
+        } else if (i == R.id.btn_order) {
+            if (!CommonAppConfig.getInstance().isLogin()) {
+                LoginActivity.forward(mContext);
+                return;
+            }
+            BuyerOrderActivity.forward(mContext, 0);
         }
     }
 

ybvideoandroid/main/src/main/res/drawable/bg_login_content.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners
+        android:topLeftRadius="20dp"
+        android:topRightRadius="20dp"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp" />
+</shape>

ybvideoandroid/main/src/main/res/drawable/bg_login_gradient.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#D6FA73"
+        android:centerColor="#82E29D"
+        android:endColor="#04CB64"
+        android:angle="0" />
+</shape>

ybvideoandroid/main/src/main/res/drawable/bg_login_input_white.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 主背景为白色 -->
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#FFFFFF" />
+        </shape>
+    </item>
+    <!-- 底部边框 -->
+    <item android:top="49dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#D4D4D4" />
+        </shape>
+    </item>
+</layer-list>

ybvideoandroid/main/src/main/res/drawable/bg_shop_top.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gradient xmlns:android="http://schemas.android.com/apk/res/android"
-    android:type="linear"
-    android:angle="0"
-    android:startColor="#ffd6fa73"
-    android:centerColor="#ff82e29d"
-    android:endColor="#ff04cb64" />
+<shape  xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient xmlns:android="http://schemas.android.com/apk/res/android"
+        android:type="linear"
+        android:angle="0"
+        android:startColor="#ffd6fa73"
+        android:centerColor="#ff82e29d"
+        android:endColor="#ff04cb64" />
+</shape>

ybvideoandroid/main/src/main/res/layout/activity_live_square.xml

@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="@color/white"
     >
 
     <include layout="@layout/view_title"/>

ybvideoandroid/main/src/main/res/layout/activity_login.xml

@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/white">
 
     <LinearLayout
         android:id="@+id/group_login_tip"
@@ -53,32 +54,111 @@
         android:textSize="15sp"
         android:visibility="invisible" />
 
+    <!-- 顶部渐变背景区域 -->
+    <LinearLayout
+        android:id="@+id/top_gradient_area"
+        android:layout_width="match_parent"
+        android:layout_height="325dp"
+        android:background="@drawable/bg_login_gradient"
+        android:orientation="vertical">
+        <com.yunbao.common.custom.StatusBarView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"/>
 
-    <TextView
-        android:id="@+id/tip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="80dp"
-        android:text="@string/login_tip_3"
-        android:textColor="@color/textColor"
-        android:gravity="center"
-        android:textSize="22sp" />
+        <!-- 新增的标题栏 -->
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="46dp">
+
+            <TextView
+                android:id="@+id/titleView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_centerHorizontal="true"
+                android:gravity="center"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:textColor="@color/white"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+            <ImageView
+                android:id="@+id/btn_back"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_centerVertical="true"
+                android:onClick="backClick"
+                android:padding="9dp"
+                android:src="@mipmap/icon_back"
+                app:tint="@color/white" />
+
+        </RelativeLayout>
+
+        <!-- 欢迎文字区域 -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_marginBottom="80dp"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/welcomeTip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:text="Welcome"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:textSize="20sp" />
+            <TextView
+                android:id="@+id/tip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginTop="13dp"
+                android:text="@string/welcome_to_cloud_mirror"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:textSize="20sp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+<!--    <TextView-->
+<!--        android:id="@+id/tip"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="40dp"-->
+<!--        android:layout_centerHorizontal="true"-->
+<!--        android:layout_marginTop="80dp"-->
+<!--        android:text="@string/welcome_to_cloud_mirror"-->
+<!--        android:textColor="@color/textColor"-->
+<!--        android:textStyle="bold"-->
+<!--        android:gravity="center"-->
+<!--        android:textSize="22sp" />-->
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/tip"
+        android:layout_below="@+id/top_gradient_area"
         android:layout_centerHorizontal="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="40dp"
-        android:layout_marginRight="20dp"
-        android:orientation="vertical">
+        android:paddingLeft="20dp"
+        android:layout_marginTop="-80dp"
+        android:paddingRight="20dp"
+        android:orientation="vertical"
+        android:background="@drawable/bg_login_content">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:background="@drawable/login_input">
+            android:layout_marginTop="50dp"
+            android:background="@drawable/bg_login_input_white">
+<!--            android:background="@drawable/login_input"-->
 
             <LinearLayout
                 android:id="@+id/btn_choose_country"
@@ -95,7 +175,7 @@
                     android:gravity="center_vertical|right"
                     android:minWidth="50dp"
                     android:text="+86"
-                    android:textColor="@color/white"
+                    android:textColor="#333333"
                     android:textSize="16sp" />
 
                 <ImageView
@@ -105,7 +185,7 @@
                     android:layout_marginLeft="5dp"
                     android:adjustViewBounds="true"
                     android:src="@mipmap/icon_login_down"
-                    app:tint="@color/white" />
+                    app:tint="#333333" />
             </LinearLayout>
 
 
@@ -121,8 +201,8 @@
                 android:inputType="number"
                 android:maxLength="11"
                 android:singleLine="true"
-                android:textColor="@color/textColor"
-                android:textColorHint="@color/gray4"
+                android:textColor="#333333"
+                android:textColorHint="#999999"
                 android:textSize="16sp" />
         </LinearLayout>
 
@@ -130,7 +210,8 @@
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_marginTop="10dp"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:background="@drawable/bg_login_input_white">
 
             <EditText
                 android:id="@+id/edit_code"
@@ -138,26 +219,28 @@
                 android:layout_height="match_parent"
                 android:layout_marginRight="10dp"
                 android:layout_weight="1"
-                android:background="@drawable/login_input"
                 android:gravity="center_vertical"
                 android:hint="@string/login_input_code"
                 android:inputType="number"
                 android:paddingLeft="10dp"
                 android:singleLine="true"
-                android:textColor="@color/textColor"
-                android:textColorHint="@color/gray1"
-                android:textSize="16sp" />
+                android:textColor="#333333"
+                android:textColorHint="#999999"
+                android:textSize="16sp"
+                android:background="@null" />
+<!--            android:background="@drawable/login_input"-->
 
             <TextView
                 android:id="@+id/btn_get_code"
                 android:layout_width="100dp"
                 android:layout_height="match_parent"
-                android:background="@drawable/login_input"
+
                 android:gravity="center"
                 android:onClick="loginClick"
                 android:text="@string/login_get_code"
-                android:textColor="@color/fg_btn_login_code"
+                android:textColor="#F73906"
                 android:textSize="14sp" />
+<!--            android:background="@drawable/login_input"-->
 
         </LinearLayout>
 
@@ -187,5 +270,5 @@
 
     </LinearLayout>
 
-    <include layout="@layout/view_title" />
+<!--    <include layout="@layout/view_title" />-->
 </RelativeLayout>

ybvideoandroid/main/src/main/res/layout/item_home_hot.xml

@@ -5,6 +5,7 @@
     android:layout_width="0dp"
     android:layout_height="0dp"
     android:layout_marginBottom="2dp"
+    android:background="@color/white"
     >
 
     <com.yunbao.common.custom.RatioImageView

ybvideoandroid/main/src/main/res/layout/item_main_mall_head.xml

@@ -183,6 +183,7 @@
                 android:paddingLeft="7dp"
                 android:paddingRight="7dp"
                 android:layout_gravity="center_horizontal"
+                android:gravity="center_vertical"
                 android:text="@string/normal_goods_tip"
                 android:background="@drawable/bg_shop_hot_menu"
                 android:textColor="@color/white"
@@ -210,6 +211,7 @@
                 android:layout_gravity="center_horizontal"
                 android:text="@string/agricultural_assistance"
                 android:textColor="#333333"
+                android:textStyle="bold"
                 android:textSize="15sp"
                 />
             <TextView
@@ -217,7 +219,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="18dp"
                 android:layout_marginTop="4dp"
+                android:paddingLeft="7dp"
+                android:paddingRight="7dp"
                 android:layout_gravity="center_horizontal"
+                android:gravity="center_vertical"
                 android:text="@string/agricultural_assistance_tip"
                 android:textColor="#999999"
                 android:textSize="11sp"
@@ -244,6 +249,7 @@
                 android:layout_gravity="center_horizontal"
                 android:text="@string/special_seckill"
                 android:textColor="#333333"
+                android:textStyle="bold"
                 android:textSize="15sp"
                 />
             <TextView
@@ -251,7 +257,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="18dp"
                 android:layout_marginTop="4dp"
+                android:paddingLeft="7dp"
+                android:paddingRight="7dp"
                 android:layout_gravity="center_horizontal"
+                android:gravity="center_vertical"
                 android:text="@string/special_seckill_tip"
                 android:textColor="#999999"
                 android:textSize="11sp"

ybvideoandroid/main/src/main/res/layout/view_main_home.xml

@@ -2,7 +2,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/white">
 
     <com.yunbao.common.custom.MyViewPager
         android:id="@+id/viewPager"
@@ -27,13 +28,23 @@
             android:gravity="center_vertical"
             >
 
+<!--            <ImageView-->
+<!--                android:id="@+id/btn_menu"-->
+<!--                android:layout_width="26dp"-->
+<!--                android:layout_height="26dp"-->
+<!--                android:onClick="mainClick"-->
+<!--                android:layout_marginLeft="10dp"-->
+<!--                android:src="@mipmap/icon_home_menu"-->
+<!--                />-->
             <ImageView
-                android:id="@+id/btn_menu"
-                android:layout_width="26dp"
-                android:layout_height="26dp"
+                android:id="@+id/btn_live_square"
+                android:layout_width="46dp"
+                android:layout_height="46dp"
                 android:onClick="mainClick"
                 android:layout_marginLeft="10dp"
-                android:src="@mipmap/icon_home_menu"
+                app:tint="@color/black"
+                android:padding="10dp"
+                android:src="@mipmap/icon_live_square"
                 />
 
 

ybvideoandroid/main/src/main/res/layout/view_main_home_hot.xml

@@ -3,10 +3,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="48dp">
+    android:paddingBottom="48dp"
+    android:background="@color/white">
 
     <FrameLayout
-        android:background="@color/black"
+        android:background="@color/white"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="46dp">

ybvideoandroid/main/src/main/res/layout/view_main_mall.xml

@@ -74,7 +74,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="10dp"
                     android:src="@mipmap/icon_main_search"
-                    android:tint="#7D7D7D" />
+                    app:tint="#7D7D7D" />
 
                 <TextView
                     android:layout_width="match_parent"

ybvideoandroid/main/src/main/res/layout/view_main_me.xml

@@ -17,7 +17,7 @@
         android:layout_width="120dp"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center_horizontal"
-        android:layout_marginBottom="10dp"
+        android:layout_marginBottom="28dp"
         android:adjustViewBounds="true"
         android:src="@mipmap/icon_no_works"
         android:visibility="invisible"

ybvideoandroid/main/src/main/res/layout/view_no_data_live.xml

@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
         android:text="@string/live_no_data"
-        android:textColor="@color/textColor"
+        android:textColor="@color/black"
         android:textSize="14sp"
         />
 

ybvideoandroid/main/src/main/res/layout/view_user_home.xml

@@ -277,10 +277,11 @@
                         android:orientation="horizontal">
 
                         <LinearLayout
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
                             android:layout_toEndOf="@+id/fl"
+                            android:layout_weight="1"
                             android:orientation="vertical">
 
                             <TextView
@@ -315,19 +316,14 @@
 
                                 <ImageView
                                     android:id="@+id/icon_id_copy"
-                                    android:layout_width="15dp"
-                                    android:layout_height="15dp"
+                                    android:layout_width="10dp"
+                                    android:layout_height="10dp"
                                     android:layout_gravity="center_vertical"
                                     android:layout_marginStart="5dp"
                                     android:src="@mipmap/icon_id_copy"
                                     android:visibility="visible" />
 
                             </LinearLayout>
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent">
-
-                            </LinearLayout>
                         </LinearLayout>
 
 <!--                        <LinearLayout-->
@@ -526,6 +522,104 @@
 
                             -->
 
+                        <LinearLayout
+                            android:id="@+id/group_self_edit"
+                            android:layout_width="wrap_content"
+                            android:layout_height="40dp"
+                            android:visibility="gone"
+                            tools:visibility="visible"
+                            >
+                            <TextView
+                                android:id="@+id/btn_edit_profile"
+                                android:layout_width="wrap_content"
+                                android:layout_height="40dp"
+                                android:background="@drawable/textview_border_circle2"
+                                android:gravity="center"
+                                android:minWidth="100dp"
+                                android:paddingLeft="10dp"
+                                android:paddingEnd="10dp"
+                                android:text="@string/edit_profile"
+                                android:textColor="#7D7D7D"
+                                android:textSize="14sp" />
+                            <ImageView
+                                android:id="@+id/btn_sign_day"
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/textview_border_circle2"
+                                android:padding="10dp"
+                                android:src="@mipmap/sign_day"
+                                android:visibility="gone"
+                                tools:visibility="visible"
+                                app:tint="#404040"
+                                />
+                        </LinearLayout>
+                        <LinearLayout
+                            android:id="@+id/group_other_follow"
+                            android:layout_width="wrap_content"
+                            android:layout_height="40dp"
+                            android:visibility="gone"
+                            tools:visibility="visible"
+                            >
+
+                            <FrameLayout
+                                android:id="@+id/btn_change_follow"
+                                android:layout_width="wrap_content"
+                                android:layout_height="40dp"
+                                android:minWidth="100dp"
+                                tools:background="@drawable/textview_border_circle2"
+                                >
+
+                                <TextView
+                                    android:id="@+id/follow_yes"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:text="@string/following"
+                                    android:textColor="#7d7d7d"
+                                    android:textSize="14sp"
+                                    android:visibility="invisible"
+                                    tools:visibility="visible"
+                                    />
+
+                                <LinearLayout
+                                    android:id="@+id/follow_no"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:gravity="center_vertical"
+                                    android:orientation="horizontal"
+                                    android:visibility="invisible"
+                                    >
+
+                                    <ImageView
+                                        android:layout_width="15dp"
+                                        android:layout_height="15dp"
+                                        android:scaleType="centerCrop"
+                                        android:src="@mipmap/add_white" />
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="5dp"
+                                        android:text="@string/follow"
+                                        android:textColor="@color/white"
+                                        android:textSize="14sp" />
+                                </LinearLayout>
+                            </FrameLayout>
+
+                            <ImageView
+                                android:id="@+id/btn_chat"
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/textview_border_circle2"
+                                android:padding="10dp"
+                                android:src="@mipmap/icon_chat"
+                                app:tint="#404040"
+                                />
+
+                        </LinearLayout>
                     </LinearLayout>
 
                     <LinearLayout
@@ -544,15 +638,6 @@
                             android:textSize="13sp"
                             android:gravity="center_vertical"
                             />
-                        <ImageView
-                            android:id="@+id/btn_modify"
-                            android:layout_width="11dp"
-                            android:layout_height="10dp"
-                            android:layout_marginLeft="5dp"
-                            android:src="@mipmap/icon_sign_modify"
-                            android:layout_gravity="center"
-                            />
-
                     </LinearLayout>
 
                     <LinearLayout
@@ -672,129 +757,133 @@
                     <FrameLayout
                         android:id="@+id/group_shop"
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="wrap_content"
                         android:layout_marginTop="14dp"
-                        android:visibility="gone"
+                        android:visibility="visible"
                         tools:visibility="visible"
                         >
 
-                        <LinearLayout
-                            android:id="@+id/group_self_shop"
-                            android:layout_width="match_parent"
-                            android:layout_height="50dp"
-                            android:orientation="horizontal"
-                            android:visibility="invisible"
-                            tools:visibility="invisible"
-                            >
-
-                            <LinearLayout
-                                android:id="@+id/btn_shop_self"
-                                android:layout_width="0dp"
-                                android:layout_height="50dp"
-                                android:layout_marginLeft="5dp"
-                                android:layout_marginRight="5dp"
-                                android:layout_weight="1"
-                                android:gravity="center_vertical"
-                                android:orientation="horizontal">
-
-                                <ImageView
-                                    android:layout_width="50dp"
-                                    android:layout_height="50dp"
-                                    android:background="@drawable/textview_border_circle2"
-                                    android:padding="13dp"
-                                    app:tint="#404040"
-                                    android:scaleType="centerCrop"
-                                    android:src="@mipmap/icon_live_shop" />
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="10dp"
-                                    android:orientation="vertical">
-
-
-
-                                    <TextView
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:layout_marginTop="3dp"
-                                        android:singleLine="true"
-                                        android:text="@string/tip_16"
-                                        android:textColor="#7D7D7D"
-                                        android:textSize="12sp" />
-                                </LinearLayout>
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:id="@+id/btn_collect"
-                                android:layout_width="0dp"
-                                android:layout_height="50dp"
-                                android:layout_marginLeft="5dp"
-                                android:layout_marginRight="5dp"
-                                android:layout_weight="1"
-                                android:gravity="center_vertical"
-                                android:orientation="horizontal">
-
-
-                                <ImageView
-                                    android:layout_width="50dp"
-                                    android:layout_height="50dp"
-                                    android:background="@drawable/textview_border_circle2"
-                                    android:padding="13dp"
-                                    android:scaleType="centerCrop"
-                                    app:tint="#404040"
-                                    android:src="@mipmap/icon_collect" />
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="10dp"
-                                    android:orientation="vertical">
-
-                                    <TextView
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:singleLine="true"
-                                        android:text="@string/tip_17"
-                                        android:textColor="#404040"
-                                        android:textSize="13sp" />
-
-
-                                    <TextView
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:layout_marginTop="3dp"
-                                        android:singleLine="true"
-                                        android:text="@string/tip_18"
-                                        android:textColor="#7d7d7d"
-                                        android:textSize="12sp" />
-
-
-                                </LinearLayout>
-
-                            </LinearLayout>
-
-
-                        </LinearLayout>
+                        <!--
+                       <LinearLayout
+                           android:id="@+id/group_self_shop"
+                           android:layout_width="match_parent"
+                           android:layout_height="50dp"
+                           android:orientation="horizontal"
+                           android:visibility="invisible"
+                           tools:visibility="invisible"
+                           >
+
+
+                           <LinearLayout
+                               android:id="@+id/btn_shop_self"
+                               android:layout_width="0dp"
+                               android:layout_height="50dp"
+                               android:layout_marginLeft="5dp"
+                               android:layout_marginRight="5dp"
+                               android:layout_weight="1"
+                               android:gravity="center_vertical"
+                               android:orientation="horizontal">
+
+                               <ImageView
+                                   android:layout_width="50dp"
+                                   android:layout_height="50dp"
+                                   android:background="@drawable/textview_border_circle2"
+                                   android:padding="13dp"
+                                   app:tint="#404040"
+                                   android:scaleType="centerCrop"
+                                   android:src="@mipmap/icon_live_shop" />
+
+                               <LinearLayout
+                                   android:layout_width="match_parent"
+                                   android:layout_height="wrap_content"
+                                   android:layout_marginLeft="10dp"
+                                   android:orientation="vertical">
+
+
+
+                                   <TextView
+                                       android:layout_width="match_parent"
+                                       android:layout_height="wrap_content"
+                                       android:layout_marginTop="3dp"
+                                       android:singleLine="true"
+                                       android:text="@string/tip_16"
+                                       android:textColor="#7D7D7D"
+                                       android:textSize="12sp" />
+                               </LinearLayout>
+
+                           </LinearLayout>
+
+                           <LinearLayout
+                               android:id="@+id/btn_collect"
+                               android:layout_width="0dp"
+                               android:layout_height="50dp"
+                               android:layout_marginLeft="5dp"
+                               android:layout_marginRight="5dp"
+                               android:layout_weight="1"
+                               android:gravity="center_vertical"
+                               android:orientation="horizontal">
+
+
+                               <ImageView
+                                   android:layout_width="50dp"
+                                   android:layout_height="50dp"
+                                   android:background="@drawable/textview_border_circle2"
+                                   android:padding="13dp"
+                                   android:scaleType="centerCrop"
+                                   app:tint="#404040"
+                                   android:src="@mipmap/icon_collect" />
+
+                               <LinearLayout
+                                   android:layout_width="match_parent"
+                                   android:layout_height="wrap_content"
+                                   android:layout_marginLeft="10dp"
+                                   android:orientation="vertical">
+
+                                   <TextView
+                                       android:layout_width="match_parent"
+                                       android:layout_height="wrap_content"
+                                       android:singleLine="true"
+                                       android:text="@string/tip_17"
+                                       android:textColor="#404040"
+                                       android:textSize="13sp" />
+
+
+                                   <TextView
+                                       android:layout_width="match_parent"
+                                       android:layout_height="wrap_content"
+                                       android:layout_marginTop="3dp"
+                                       android:singleLine="true"
+                                       android:text="@string/tip_18"
+                                       android:textColor="#7d7d7d"
+                                       android:textSize="12sp" />
+
+
+                               </LinearLayout>
+
+                           </LinearLayout>
+
+
+
+                       </LinearLayout>
+                       -->
 
                         <LinearLayout
-                            android:id="@+id/group_other_shop"
+                            android:id="@+id/group_self_shop"
                             android:layout_width="match_parent"
                             android:layout_height="40dp"
                             android:orientation="horizontal"
-                            android:visibility="invisible"
+                            android:visibility="visible"
                             tools:visibility="visible"
                             >
 
                             <LinearLayout
-                                android:id="@+id/btn_shop_other"
+                                android:id="@+id/btn_shop_self"
                                 android:layout_width="wrap_content"
                                 android:layout_height="40dp"
                                 android:layout_weight="1"
                                 android:gravity="center_vertical"
                                 android:orientation="vertical"
-                                android:visibility="invisible"
+                                android:visibility="visible"
                                 tools:visibility="visible"
                                 >
 
@@ -824,7 +913,7 @@
                                 android:layout_weight="1"
                                 android:gravity="center_vertical"
                                 android:orientation="vertical"
-                                android:visibility="invisible"
+                                android:visibility="visible"
                                 tools:visibility="visible"
                                 >
 
@@ -853,7 +942,7 @@
                                 android:layout_weight="1"
                                 android:gravity="center_vertical"
                                 android:orientation="vertical"
-                                android:visibility="invisible"
+                                android:visibility="visible"
                                 tools:visibility="visible"
                                 >
 
@@ -882,7 +971,7 @@
                                 android:layout_weight="1"
                                 android:gravity="center_vertical"
                                 android:orientation="vertical"
-                                android:visibility="invisible"
+                                android:visibility="visible"
                                 tools:visibility="visible"
                                 >
 
@@ -906,72 +995,180 @@
 
                         </LinearLayout>
 
-                    </FrameLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="33dp"
-                        android:layout_marginTop="16dp"
-                        android:orientation="horizontal"
-                        android:gravity="center"
-                        android:background="@color/white">
-
                         <LinearLayout
-                            android:id="@+id/btn_edit_profile"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:layout_marginLeft="20dp"
+                            android:id="@+id/group_other_shop"
+                            android:layout_width="match_parent"
+                            android:layout_height="50dp"
                             android:orientation="horizontal"
-                            android:gravity="center"
-                            android:background="@drawable/bg_main_rounded"
+                            android:visibility="invisible"
+                            tools:visibility="visible"
                             >
-                            <TextView
-                                android:id="@+id/edit_profile"
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:gravity="center"
-                                android:text="@string/edit_profile"
-                                android:textColor="#ff333333"
-                                android:textSize="13sp"
-                                />
 
-                        </LinearLayout>
+                            <LinearLayout
+                                android:id="@+id/btn_shop_other"
+                                android:layout_width="0dp"
+                                android:layout_height="50dp"
+                                android:layout_marginLeft="5dp"
+                                android:layout_marginRight="5dp"
+                                android:layout_weight="1"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal"
+                                android:visibility="invisible"
+                                tools:visibility="visible"
+                                >
 
-                        <LinearLayout
-                            android:id="@+id/btn_add_friend"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginRight="20dp"
-                            android:layout_marginLeft="20dp"
-                            android:layout_weight="1"
-                            android:orientation="horizontal"
-                            android:gravity="center"
-                            android:background="@drawable/bg_main_rounded"
-                            >
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:gravity="center"
-                                android:text="@string/add_friend"
-                                android:textColor="#ff333333"
-                                android:textSize="13sp"
-                                />
-                            <TextView
-                                android:id="@+id/new_friends_count"
-                                android:layout_width="16dp"
-                                android:layout_height="16dp"
+                                <ImageView
+                                    android:layout_width="50dp"
+                                    android:layout_height="50dp"
+                                    android:background="@drawable/textview_border_circle2"
+                                    android:padding="13dp"
+                                    android:scaleType="centerCrop"
+                                    app:tint="#404040"
+                                    android:src="@mipmap/icon_live_shop" />
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="10dp"
+                                    android:orientation="vertical">
+
+                                    <TextView
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:singleLine="true"
+                                        android:text="@string/tip_15"
+                                        android:textColor="#404040"
+                                        android:textSize="13sp" />
+
+                                    <TextView
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="3dp"
+                                        android:singleLine="true"
+                                        android:text="@string/tip_16"
+                                        android:textColor="#7d7d7d"
+                                        android:textSize="12sp" />
+                                </LinearLayout>
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:id="@+id/btn_live"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
                                 android:layout_marginLeft="5dp"
-                                android:gravity="center"
-                                android:text="13"
-                                android:background="@drawable/bg_circle_1"
-                                android:textColor="@color/white"
-                                android:textSize="11sp"
-                                />
+                                android:layout_marginRight="5dp"
+                                android:layout_weight="1"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal"
+                                android:visibility="invisible"
+                                tools:visibility="visible"
+                                >
+
+                                <ImageView
+                                    android:background="@drawable/textview_border_circle2"
+                                    android:layout_width="50dp"
+                                    android:layout_height="50dp"
+                                    android:padding="13dp"
+                                    android:scaleType="centerCrop"
+                                    app:tint="#404040"
+                                    android:src="@mipmap/icon_record" />
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="10dp"
+                                    android:orientation="vertical">
+
+                                    <TextView
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:singleLine="true"
+                                        android:text="@string/tip_19"
+                                        android:textColor="#404040"
+                                        android:textSize="13sp" />
+
+                                    <TextView
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="3dp"
+                                        android:singleLine="true"
+                                        android:text="@string/tip_20"
+                                        android:textColor="#7d7d7d"
+                                        android:textSize="12sp" />
+
+                                </LinearLayout>
+
+                            </LinearLayout>
+
                         </LinearLayout>
 
+                    </FrameLayout>
 
-                    </LinearLayout>
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="33dp"-->
+<!--                        android:layout_marginTop="16dp"-->
+<!--                        android:orientation="horizontal"-->
+<!--                        android:gravity="center"-->
+<!--                        android:background="@color/white">-->
+
+<!--                        <LinearLayout-->
+<!--                            android:id="@+id/btn_edit_profile"-->
+<!--                            android:layout_width="0dp"-->
+<!--                            android:layout_height="match_parent"-->
+<!--                            android:layout_weight="1"-->
+<!--                            android:layout_marginLeft="20dp"-->
+<!--                            android:orientation="horizontal"-->
+<!--                            android:gravity="center"-->
+<!--                            android:background="@drawable/bg_main_rounded"-->
+<!--                            >-->
+<!--                            <TextView-->
+<!--                                android:id="@+id/edit_profile"-->
+<!--                                android:layout_width="wrap_content"-->
+<!--                                android:layout_height="match_parent"-->
+<!--                                android:gravity="center"-->
+<!--                                android:text="@string/edit_profile"-->
+<!--                                android:textColor="#ff333333"-->
+<!--                                android:textSize="13sp"-->
+<!--                                />-->
+
+<!--                        </LinearLayout>-->
+
+<!--                        <LinearLayout-->
+<!--                            android:id="@+id/btn_add_friend"-->
+<!--                            android:layout_width="0dp"-->
+<!--                            android:layout_height="match_parent"-->
+<!--                            android:layout_marginRight="20dp"-->
+<!--                            android:layout_marginLeft="20dp"-->
+<!--                            android:layout_weight="1"-->
+<!--                            android:orientation="horizontal"-->
+<!--                            android:gravity="center"-->
+<!--                            android:background="@drawable/bg_main_rounded"-->
+<!--                            >-->
+<!--                            <TextView-->
+<!--                                android:layout_width="wrap_content"-->
+<!--                                android:layout_height="match_parent"-->
+<!--                                android:gravity="center"-->
+<!--                                android:text="@string/add_friend"-->
+<!--                                android:textColor="#ff333333"-->
+<!--                                android:textSize="13sp"-->
+<!--                                />-->
+<!--                            <TextView-->
+<!--                                android:id="@+id/new_friends_count"-->
+<!--                                android:layout_width="16dp"-->
+<!--                                android:layout_height="16dp"-->
+<!--                                android:layout_marginLeft="5dp"-->
+<!--                                android:gravity="center"-->
+<!--                                android:text="13"-->
+<!--                                android:background="@drawable/bg_circle_1"-->
+<!--                                android:textColor="@color/white"-->
+<!--                                android:textSize="11sp"-->
+<!--                                />-->
+<!--                        </LinearLayout>-->
+
+
+<!--                    </LinearLayout>-->
 
 
                 </LinearLayout>

ybvideoandroid/main/src/main/res/layout/view_user_option_me.xml

@@ -25,7 +25,8 @@
         android:layout_alignParentEnd="true"
         android:orientation="vertical"
         android:visibility="visible"
-        android:layout_marginTop="245dp"
+        android:layout_marginTop="180dp"
+
         >