YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1:添加备用服务器，在请求themeData的时候，返回的不对的时候，就切换服务器

Browse Source
This commit is contained in:
梁小江
2025-12-31 03:31:31 +08:00
parent 479e039e56
commit c2fd1df529
12 changed files with 147 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
View File

@@ -302,7 +302,7 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
} else if (id == R.id.swit_qh) {
if (mBinding.switQh.isChecked()) {
SpUtil.setTaskService(1);
CommonAppContext.selectRelease = 2;
CommonAppContext.selectRelease = 1;
} else {
SpUtil.setTaskService(0);
CommonAppContext.selectRelease = -1;

10
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
View File

@@ -158,7 +158,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
roomTypeChildren.add(new RoomSettingBean("拍卖", "ic_auction", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeAuction, read, isSelected, false, false));
roomTypeChildren.add(new RoomSettingBean("点唱", "jiao_y", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy, read, isSelected, false, false));
roomTypeChildren.add(new RoomSettingBean("互娱", "ic_jiaoy", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU, read, isSelected, false, false));
roomTypeChildren.add(new RoomSettingBean("练歌房", "ic_liang", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeLianG, read, isSelected, false, false));
// roomTypeChildren.add(new RoomSettingBean("练歌房", "ic_liang", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeLianG, read, isSelected, false, false));
roomTypeChildren.add(new RoomSettingBean("签约", "sing_contract", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNCONTRACT, read, isSelected, false, false));
roomTypeParent.setChildren(roomTypeChildren);
parentList.add(roomTypeParent);
@@ -389,9 +389,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
queren("9");
} else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU) {
queren("7");
} else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) {
queren("-1");
} else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNCONTRACT) {
}
// else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) { 2025年12月30日20:56:53，根据需求，隐藏用户自主切换练歌房
// queren("-1");
// }
else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNCONTRACT) {
queren("10");
} else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomSetting) {
if (roomInfoResp != null) {

115
MainModule/src/main/res/layout/activity_dynamic_detail.xml
View File

@@ -22,32 +22,31 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- 主内容 RecyclerView -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycle_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_6"
android:paddingRight="@dimen/dp_6"
android:paddingBottom="@dimen/dp_12"
tools:itemCount="1"
tools:listitem="@layout/item_cirle_list" />
<!-- 主内容 RecyclerView -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycle_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_6"
android:paddingRight="@dimen/dp_6"
android:paddingBottom="@dimen/dp_12"
tools:itemCount="1"
tools:listitem="@layout/item_cirle_list" />
<!-- 评论列表 ScrollView -->
<!-- <ScrollView-->
<!-- android:id="@+id/scroll_view"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="0dp"-->
<!-- android:layout_weight="1"-->
<!-- android:background="@drawable/bg_r16_fff">-->
<!-- 评论列表 ScrollView -->
<!-- <ScrollView-->
<!-- android:id="@+id/scroll_view"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="0dp"-->
<!-- android:layout_weight="1"-->
<!-- android:background="@drawable/bg_r16_fff">-->
<LinearLayout
android:layout_width="match_parent"
@@ -89,48 +88,48 @@
</LinearLayout>
<!-- 输入区域，始终位于底部 -->
<LinearLayout
android:id="@+id/cl_input"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_70"
android:background="#ffffff"
android:orientation="horizontal"
android:paddingVertical="@dimen/dp_8">
<!-- 输入区域，始终位于底部 -->
<LinearLayout
android:id="@+id/cl_input"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_70"
android:background="#ffffff"
android:orientation="horizontal"
android:paddingVertical="@dimen/dp_8">
<EditText
android:id="@+id/et_input"
android:layout_width="0dp"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/bg_r80_hui"
android:gravity="center_vertical"
android:hint="就差你一个神评论~"
android:paddingStart="@dimen/dp_12"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_send"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/et_input"
android:layout_width="0dp"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/bg_r80_hui"
android:gravity="center_vertical"
android:hint="就差你一个神评论~"
android:paddingStart="@dimen/dp_12"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_send"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_send"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_12"
android:background="@drawable/cs"
android:gravity="center"
android:text="发送"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_send"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_12"
android:background="@drawable/cs"
android:gravity="center"
android:text="发送"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>