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

Merge branch 'branch_new_69' into branch_new

Browse Source
This commit is contained in:
骆召亮
2025-12-09 19:07:52 +08:00
parent 314ce6007d 1dbdb9cabf
commit fdd7de3473
7 changed files with 32 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BaseModule/src/main/res/layout/room_view_friendship_wheat.xml
View File

@@ -50,10 +50,10 @@
android:adjustViewBounds="true"
app:autoPlay="false"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/iv_frame"
app:layout_constraintEnd_toEndOf="@id/iv_frame"
app:layout_constraintStart_toStartOf="@id/iv_frame"
app:layout_constraintTop_toTopOf="@id/iv_frame"
app:layout_constraintBottom_toBottomOf="@id/riv"
app:layout_constraintEnd_toEndOf="@id/riv"
app:layout_constraintStart_toStartOf="@id/riv"
app:layout_constraintTop_toTopOf="@id/riv"
app:loopCount="0"
app:source="mic.svga" />

2
MainModule/src/main/java/com/xscm/modulemain/Application.kt
View File

@@ -64,6 +64,8 @@ open class Application : CommonAppContext() {
initLogUtils()
initCrashUtils()
initSmartRefreshLayout()
if (true)
return
AppUtils.registerAppStatusChangedListener(object : Utils.OnAppStatusChangedListener {
override fun onForeground(activity: Activity?) {//应用切换到前台

22
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -578,11 +578,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
view
)
}
mBinding!!.roomTop.muZc.setOnClickListener { view: View ->
this.onClick(
view
)
}
mBinding!!.inputMenu1.performClick()
V2TIMManager.getConversationManager()
@@ -2749,22 +2745,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
aBoolean = true
}
}
} else if (id == R.id.mu_zc) {
val muZc: RoomKtvWheatView = mBinding!!.roomTop.muZc
if (muZc.getUserId() != "") {
RoomUserInfoFragment.show(
roomId,
muZc.getUserId(),
muZc.pitNumber,
getHostUser(),
false,
2,
isNumberWhether(),
supportFragmentManager
)
} else {
MvpPre!!.applyPit(roomId, "9")
}
}
}

14
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java
View File

@@ -516,7 +516,15 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
startActivity(new Intent(ActivityUtils.getTopActivity(), TransparentActivity.class));
}
@SuppressLint("CheckResult")
private void performFragmentReplacement(Fragment newFragment) {
if (newFragment instanceof RoomKtvFragment){
((RoomActivity)ActivityUtils.getTopActivity()).getBinding().recyclerView.setVisibility(View.VISIBLE);
}else {
((RoomActivity)ActivityUtils.getTopActivity()).getBinding().recyclerView.setVisibility(View.GONE);
}
if (getChildFragmentManager().isDestroyed()) {
return; // 避免状态销毁后操作导致崩溃
}
@@ -557,6 +565,12 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
transaction.commitAllowingStateLoss();
currentFragment = newFragment;
Observable.timer(1000, TimeUnit.MILLISECONDS).observeOn(AndroidSchedulers.mainThread()).subscribe(
aLong ->{
startActivity(new Intent(ActivityUtils.getTopActivity(), TransparentActivity.class));
}
);
}

18
MainModule/src/main/res/layout/activity_room.xml
View File

@@ -159,13 +159,13 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/dp_10"
app:layout_constraintDimensionRatio="1:0.88"
android:clipChildren="false"
android:clipToPadding="false"
app:layout_constraintBottom_toTopOf="@id/ease_container"
app:layout_constraintDimensionRatio="1:0.88"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/ease_container"/>
app:layout_constraintTop_toTopOf="parent" />
<FrameLayout
@@ -175,20 +175,20 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/vp_room_pager"/>
app:layout_constraintTop_toBottomOf="@+id/vp_room_pager" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="@dimen/dp_58"
android:layout_height="@dimen/dp_250"
android:layout_marginEnd="@dimen/dp_21"
android:layout_marginTop="@dimen/dp_200"
android:layout_marginEnd="@dimen/dp_30"
android:nestedScrollingEnabled="true"
app:layout_constraintTop_toTopOf="parent"
app:spanCount="1"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintVertical_bias="0.0"
/>
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
<com.xscm.moduleutil.widget.AvatarFrameView

2
MainModule/src/main/res/layout/fragment_voice_category.xml
View File

@@ -271,7 +271,7 @@
app:tabIndicatorHeight="@dimen/dp_2"
app:tabIndicatorGravity="bottom"
app:tabMode="scrollable"
app:tabMinWidth="@dimen/dp_40"
app:tabMinWidth="@dimen/dp_30"
app:tabIndicatorColor="@color/colorPrimary"
app:tabTextAppearance="@style/CustomTabTextAppearance"
app:tabTextColor="#F1ECFF" />

57
MainModule/src/main/res/layout/room_top.xml
View File

@@ -94,6 +94,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_40"
android:overScrollMode="never"
android:elevation="@dimen/dp_1"
tools:listitem="@layout/item_like_user"/>
<TextView
@@ -254,61 +255,5 @@
android:visibility="invisible"/>
</LinearLayout>
<com.xscm.moduleutil.widget.RoomKtvWheatView
android:id="@+id/mu_zc"
android:layout_width="@dimen/dp_62"
android:layout_height="@dimen/dp_88"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_35"
android:clickable="true"
android:elevation="9999dp"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
android:translationZ="30dp"
android:layout_alignParentEnd="true"
app:room_wheat_number="9"
android:visibility="gone"/>
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_xsb"-->
<!-- android:layout_width="@dimen/dp_60"-->
<!-- android:layout_height="@dimen/dp_25"-->
<!-- android:layout_marginStart="@dimen/dp_8"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_alignTop="@id/btn_notice"-->
<!-- tools:visibility="visible">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_first_charge"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:scaleType="fitCenter"-->
<!-- android:src="@mipmap/room_xsb"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_first"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:textColor="#FFFFFF"-->
<!-- android:paddingEnd="@dimen/dp_2"-->
<!-- android:textSize="11sp"-->
<!-- android:gravity="center"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- android:text="小时榜" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
</RelativeLayout>
</layout>