diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index 083c2a3e..a48b5d6c 100644 --- a/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -722,7 +722,6 @@ class RoomActivity : BaseMvpActivity(), } fun isInAuctionTopBtVisible(isShow: Boolean) { - mBinding!!.roomTop.rl.visibility = View.GONE mBinding!!.roomTop.stubButtons2.visibility = if (isShow) View.VISIBLE else View.GONE } diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceCategoryFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceCategoryFragment.java index 64d20530..ba1bb7ed 100644 --- a/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceCategoryFragment.java +++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceCategoryFragment.java @@ -45,8 +45,6 @@ import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.utils.ImageUtils; import com.xscm.moduleutil.utils.logger.DataLogger; -import org.greenrobot.eventbus.EventBus; - import java.util.ArrayList; import java.util.List; @@ -286,11 +284,11 @@ public class VoiceCategoryFragment extends BaseMvpFragment implements UserGiftWallConacts.View { +public class UserGiftWallFragment extends BaseMvpFragment implements UserGiftWallConacts.View { public String userId; @@ -82,7 +82,7 @@ public class UserGiftWallFragment extends BaseMvpFragment + + + + + + + + + + + + + \ No newline at end of file diff --git a/modulemain/src/main/res/drawable/tab_indicator.xml b/modulemain/src/main/res/drawable/tab_indicator_bottom.xml similarity index 100% rename from modulemain/src/main/res/drawable/tab_indicator.xml rename to modulemain/src/main/res/drawable/tab_indicator_bottom.xml diff --git a/modulemain/src/main/res/layout/activity_ranking_list.xml b/modulemain/src/main/res/layout/activity_ranking_list.xml index 97bf75ba..e7de85e3 100644 --- a/modulemain/src/main/res/layout/activity_ranking_list.xml +++ b/modulemain/src/main/res/layout/activity_ranking_list.xml @@ -26,7 +26,7 @@ android:layout_marginLeft="@dimen/dp_10" android:layout_marginTop="@dimen/dp_5" android:layout_marginRight="@dimen/dp_10" - app:tabIndicator="@drawable/tab_indicator" + app:tabIndicator="@drawable/tab_indicator_bottom" app:tabIndicatorColor="@null" app:tabIndicatorFullWidth="false" app:tabIndicatorGravity="bottom" diff --git a/modulemain/src/main/res/layout/fragment_voice_category.xml b/modulemain/src/main/res/layout/fragment_voice_category.xml index 063ab95b..525aff40 100644 --- a/modulemain/src/main/res/layout/fragment_voice_category.xml +++ b/modulemain/src/main/res/layout/fragment_voice_category.xml @@ -1,282 +1,281 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:id="@+id/app_bar_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/color_transparent" + app:elevation="0dp"> + android:id="@+id/constraint_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingTop="@dimen/dp_10" + android:paddingRight="16dp" + app:layout_scrollFlags="scroll|enterAlways"> + + + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintWidth_percent="0.5" /> - - + android:id="@+id/im_hr" + android:layout_width="@dimen/dp_18" + android:layout_height="@dimen/dp_18" + android:layout_marginStart="@dimen/dp_18" + android:layout_marginTop="@dimen/dp_20" + android:scaleType="fitCenter" + android:src="@mipmap/f_h" + app:layout_constraintStart_toStartOf="@+id/rm_home" + app:layout_constraintTop_toTopOf="@+id/rm_home" /> + android:id="@+id/tv_home_hr" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/youshebiaotihei" + android:text="热门房间" + android:textColor="#fff1ecff" + android:textSize="@dimen/sp_17" + app:layout_constraintStart_toEndOf="@+id/im_hr" + app:layout_constraintTop_toTopOf="@+id/im_hr" /> - - + android:id="@+id/im_x" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_16" + android:src="@mipmap/home_xx" + app:layout_constraintBottom_toBottomOf="@+id/tv_home_hr" + app:layout_constraintStart_toEndOf="@+id/tv_home_hr" + app:layout_constraintTop_toTopOf="@+id/tv_home_hr" /> + android:id="@+id/banner_view_pager" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:bvp_indicator_visibility="gone" + app:layout_constraintEnd_toEndOf="@+id/im_x" + app:layout_constraintStart_toStartOf="@+id/im_hr" + app:layout_constraintTop_toBottomOf="@+id/tv_home_hr" /> + android:id="@+id/my_home" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_14" + android:scaleType="fitCenter" + android:src="@mipmap/my_home" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toEndOf="@+id/rm_home" + app:layout_constraintTop_toTopOf="parent" /> + android:id="@+id/tv_my_home" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_11" + android:layout_marginTop="@dimen/dp_5" + android:fontFamily="@font/youshebiaotihei" + android:text="我的房间" + android:textColor="#fff1ecff" + android:textSize="@dimen/sp_17" + app:layout_constraintStart_toStartOf="@+id/my_home" + app:layout_constraintTop_toTopOf="@+id/my_home" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_1" + android:text="进行一场灵魂深聊" + android:textColor="#80ffffff" + android:textSize="@dimen/sp_11" + app:layout_constraintStart_toStartOf="@+id/tv_my_home" + app:layout_constraintTop_toBottomOf="@+id/tv_my_home" /> + android:id="@+id/home_phb" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_8" + android:scaleType="fitCenter" + android:src="@mipmap/home_phb" + app:layout_constraintEnd_toEndOf="@+id/my_home" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toStartOf="@+id/my_home" + app:layout_constraintTop_toBottomOf="@+id/my_home" /> + android:id="@+id/tv_home_phb" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_11" + android:layout_marginTop="@dimen/dp_5" + android:fontFamily="@font/youshebiaotihei" + android:text="排行榜" + android:textColor="#fff1ecff" + android:textSize="@dimen/sp_17" + app:layout_constraintStart_toStartOf="@+id/home_phb" + app:layout_constraintTop_toTopOf="@+id/home_phb" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_1" + android:text="荣耀之巅 彰显实力" + android:textColor="#80ffffff" + android:textSize="@dimen/sp_11" + app:layout_constraintStart_toStartOf="@+id/tv_home_phb" + app:layout_constraintTop_toBottomOf="@+id/tv_home_phb" /> + android:id="@+id/home_gg" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_8" + android:scaleType="fitCenter" + android:src="@mipmap/home_gg" + app:layout_constraintEnd_toEndOf="@+id/home_phb" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toStartOf="@+id/home_phb" + app:layout_constraintTop_toBottomOf="@+id/home_phb" /> + android:id="@+id/tv_home_gg" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_11" + android:layout_marginTop="@dimen/dp_5" + android:fontFamily="@font/youshebiaotihei" + android:text="官方公告" + android:textColor="#fff1ecff" + android:textSize="@dimen/sp_17" + app:layout_constraintStart_toStartOf="@+id/home_gg" + app:layout_constraintTop_toTopOf="@+id/home_gg" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_1" + android:text="政策变动一键留痕" + android:textColor="#80ffffff" + android:textSize="@dimen/sp_11" + app:layout_constraintStart_toStartOf="@+id/tv_home_gg" + app:layout_constraintTop_toBottomOf="@+id/tv_home_gg" /> + android:id="@+id/rl" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_31" + android:layout_marginTop="@dimen/dp_12" + android:background="@mipmap/xiaox_b" + android:orientation="horizontal" + app:layout_constraintTop_toBottomOf="@+id/cl_h_t"> + android:id="@+id/tv_hot" + android:layout_width="@dimen/dp_24" + android:layout_height="@dimen/dp_24" + android:layout_alignParentStart="true" + android:layout_centerInParent="true" + android:layout_marginStart="@dimen/dp_15" + android:src="@mipmap/pp" + android:visibility="invisible" /> + android:id="@+id/marqueeView" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginStart="@dimen/dp_8" + android:layout_toStartOf="@+id/tv_wg" + android:layout_toEndOf="@+id/tv_hot" + app:mvAnimDuration="1000" + app:mvInterval="3000" + app:mvSingleLine="true" + app:mvTextColor="#B49FFF" + app:mvTextSize="@dimen/sp_14" /> + android:id="@+id/tv_wg" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_centerInParent="true" + android:layout_marginStart="@dimen/dp_8" + android:layout_marginEnd="@dimen/dp_25" + android:scaleType="fitCenter" + android:src="@mipmap/wg" /> + android:id="@+id/banner" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginTop="@dimen/dp_12" + app:AutoPlayTime="3000" + app:isAutoPlay="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintDimensionRatio="340:96" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/rl" + app:pointsVisibility="false" /> + android:id="@+id/sliding_tab_layout" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_34" + android:layout_marginLeft="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_12" + android:layout_marginRight="@dimen/dp_16" + app:tabIndicator="@drawable/tab_indicator_bg" + app:tabIndicatorFullWidth="true" + app:tabIndicatorHeight="@dimen/dp_15" + app:tabIndicatorGravity="center" + app:tabMode="scrollable" + app:tabSelectedTextColor="@color/white" + app:tabIndicatorColor="@android:color/transparent" + app:tabTextAppearance="@style/CustomTabTextAppearance" + app:tabTextColor="#F1ECFF" /> @@ -293,15 +292,15 @@ + android:id="@+id/view_pager" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginStart="@dimen/dp_14" + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" /> + android:layout_width="match_parent" + android:layout_height="@dimen/dp_60" + android:background="@color/color_transparent" /> \ No newline at end of file