推荐改为热门

app/src/main/java/com/nnbc123/app/MainActivity.java

@@ -122,6 +122,7 @@ import com.nnbc123.core.utils.StringUtils;
 import com.nnbc123.library.base.factory.CreatePresenter;
 import com.nnbc123.library.threadmgr.ThreadPoolManager;
 import com.nnbc123.library.utils.JavaUtil;
+import com.opensource.svgaplayer.SVGAImageView;
 import com.orhanobut.logger.Logger;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.tongdaxing.erban.upgrade.AppUpgradeHelper;
@@ -156,7 +157,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     private TextView tvId;//最小化窗口ID
     private ImageView avatarImage;
     private LinearLayout llDragInfo;
-    private LivingIconView userLivingView;
+    private SVGAImageView userLivingView;
     private View viewClose;
     private MainTabLayout mMainTabLayout;
     private AnchorCardView anchorCardView;
@@ -292,6 +293,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
 
     private void closeOpenRoomAnimation() {
         avatarLayout.setVisibility(View.GONE);
+        userLivingView.stopAnimation();
     }
 
     @Override
@@ -299,7 +301,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         super.onResume();
         mResumed = true;
         if (avatarLayout.getVisibility() == View.VISIBLE) {
-            userLivingView.start();
+            userLivingView.startAnimation();
         }
         //这里是为了处理APP后台运行的情况下点击分享房间等LinkedMe链接的情况
         UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
@@ -340,7 +342,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         super.onPause();
         mResumed = false;
         if (avatarLayout.getVisibility() == View.VISIBLE) {
-            userLivingView.stop();
+            userLivingView.stopAnimation();
         }
         mMainTabLayout.removeCallbacks(touchRunnable);
     }
@@ -369,7 +371,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         userLivingView = findViewById(R.id.liv_user);
         viewClose = findViewById(R.id.view_close);
         llDragInfo = findViewById(R.id.ll_drag_info);
-        userLivingView.setColor(Color.WHITE);
         mMainTabLayout.setOnTabClickListener(this);
         anchorCardView = findViewById(R.id.vs_anchor_card);
     }
@@ -586,7 +587,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         avatarLayout.setVisibility(View.VISIBLE);
         tvName.setText(nickName);
         tvId.setText("ID:" + uid);
-        userLivingView.start();
+        userLivingView.startAnimation();
         ImageLoadUtils.loadAvatar(MainActivity.this, avatar, avatarImage);
     }
 

app/src/main/java/com/nnbc123/app/home/fragment/PartyFragment.kt

@@ -82,7 +82,7 @@ class PartyFragment : BaseFragment(), MainMagicIndicatorAdapter.OnItemSelectList
     }
 
     private fun onGetHomeTagSuccess(tagInfoList: MutableList<HomeTagInfo>) {
-        tagInfoList.add(0,HomeTagInfo("推荐"))
+        tagInfoList.add(0,HomeTagInfo("热门"))
         var changed = false
         val oldTabInfoList: List<CharSequence> = ArrayList<CharSequence>(mTabInfoList)
         for (tagInfo in tagInfoList) {
@@ -108,7 +108,7 @@ class PartyFragment : BaseFragment(), MainMagicIndicatorAdapter.OnItemSelectList
                 mTabInfoList.add(title)
                 val tabId: Int = tagInfoList[i].id
                 fragment = when (title) {
-                    "推荐" -> {
+                    "热门" -> {
                         PartyRecommendFragment.newInstance()
                     }
                     "喜欢" -> {

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

@@ -67,16 +67,17 @@
                 <com.makeramen.roundedimageview.RoundedImageView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:alpha="0.1"
+                    android:alpha="0.5"
                     android:src="@color/black"
                     app:riv_corner_radius="7dp" />
 
-                <com.nnbc123.app.ui.widget.LivingIconView
+                <com.opensource.svgaplayer.SVGAImageView
                     android:id="@+id/liv_user"
-                    android:layout_width="10dp"
+                    android:layout_width="12dp"
-                    android:layout_height="10dp"
+                    android:layout_height="15dp"
                     android:layout_gravity="center"
-                    android:background="@color/transparent" />
+                    app:source="svga/living_white.svga"
+                   />
 
             </FrameLayout>
 

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

@@ -276,7 +276,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="15dp"
                 android:layout_marginTop="15dp"
-                android:text="为你推荐"
+                android:text="热门房间"
                 android:textColor="@color/color_161958"
                 android:textSize="14sp" />
 

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

@@ -88,7 +88,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:layout_marginTop="252dp"
-        android:text="为你推荐"
+        android:text="热门房间"
         android:textColor="@color/white"
         android:textSize="14sp" />
 

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

@@ -18,7 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:text="暂无合适房间，为你推荐其他房间～"
+            android:text="暂无合适房间，看看其他热门房间～"
             android:textColor="@color/color_333333"
             android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -881,7 +881,7 @@
     <string name="ranking">榜单</string>
     <string name="str_send_code_success">验证码已发送至\n+86</string>
     <string name="str_nick_title">昵称：</string>
-    <string name="recommend_topic">推荐话题</string>
+    <string name="recommend_topic">热门话题</string>
     <string name="join_topic">参与话题</string>
     <string name="collect">收藏</string>
     <string name="diamond">钻石</string>

app/src/module_community/java/com/nnbc123/app/community/square/SquareDynamicFragment.java

@@ -191,7 +191,7 @@ public class SquareDynamicFragment extends BaseFragment {
                             if (list.isEmpty()) {
                                 String emptyTips = "暂无动态~";
                                 if (squareType == SquareFragment.TAB_TYPE_ATTENT) {
-                                    emptyTips = "暂无动态，去推荐看看吧~";
+                                    emptyTips = "暂无动态，去热门看看吧~";
                                 }
                                 adapter.setEmptyView(EmptyViewHelper.createEmptyView(getContext(), emptyTips));
                             }

app/src/module_community/res/layout/item_square_dynamic_new.xml

@@ -26,7 +26,7 @@
         android:layout_height="0dp"
         android:background="@drawable/shape_dynamic_bottom"
         app:layout_constraintBottom_toBottomOf="@id/iv_cover"
-        app:layout_constraintDimensionRatio="165:60"
+        app:layout_constraintDimensionRatio="165:79"
         app:layout_constraintEnd_toEndOf="@id/iv_cover"
         app:layout_constraintStart_toStartOf="@id/iv_cover" />
 
@@ -35,28 +35,27 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginTop="3dp"
         android:layout_marginEnd="17dp"
+        android:layout_marginBottom="2dp"
         android:ellipsize="end"
         android:lines="1"
         android:text="动态文案文案动态文..."
         android:textColor="@color/white"
         android:textSize="14sp"
-        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/iv_avatar"
         app:layout_constraintEnd_toEndOf="@id/iv_cover"
-        app:layout_constraintStart_toStartOf="@id/iv_cover"
+        app:layout_constraintStart_toStartOf="@id/iv_cover" />
-        app:layout_constraintTop_toTopOf="@id/view_bg_bottom" />
 
     <com.nnbc123.app.common.widget.CircleImageView
         android:id="@+id/iv_avatar"
         android:layout_width="26dp"
         android:layout_height="26dp"
+        android:layout_marginBottom="10dp"
         android:src="@drawable/default_cover"
         app:cborder_color="@color/white"
         app:cborder_width="1px"
         app:layout_constraintBottom_toBottomOf="@id/iv_cover"
-        app:layout_constraintStart_toStartOf="@id/tv_content"
+        app:layout_constraintStart_toStartOf="@id/tv_content" />
-        app:layout_constraintTop_toBottomOf="@id/tv_content" />
 
     <FrameLayout
         android:id="@+id/fl_live"

app/src/module_community/res/values/strings.xml

@@ -12,7 +12,7 @@
     <string name="dy_empty_comment_tips">快来抢占沙发吧~</string>
     <string name="dy_open_other_number">展开%s条回复</string>
     <string name="dy_comment_text">评论</string>
-    <string name="dys_tab_recommend">推荐</string>
+    <string name="dys_tab_recommend">热门</string>
     <string name="dys_tab_attent">关注</string>
     <string name="dys_tab_new">最新</string>
     <string name="home_tab_dynamic">动态</string>