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

77 fix bugs.

Browse Source
This commit is contained in:
骆召亮
2025-12-22 23:19:16 +08:00
parent 8b24ac310e
commit 7e6d174297
5 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MainModule/src/main/java/com/xscm/modulemain/activity/msg/NewsPresenter.java
View File

@@ -4,6 +4,7 @@ import android.content.Context;
import com.xscm.moduleutil.bean.NewsMessageList;
import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.http.RetrofitClient;
import com.xscm.moduleutil.presenter.BasePresenter;
import java.lang.ref.WeakReference;
@@ -21,7 +22,7 @@ public class NewsPresenter extends BasePresenter<NewsContacts.View> implements N
@Override
public void getMessagetitle(String type, String page, String pageLimit) {
api.getMessagetitle(type, page, pageLimit, new BaseObserver<List<NewsMessageList>>() {
RetrofitClient.getInstance().getMessagetitle(type, page, pageLimit, new BaseObserver<List<NewsMessageList>>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
@@ -41,7 +42,7 @@ public class NewsPresenter extends BasePresenter<NewsContacts.View> implements N
@Override
public void postInvite(String apply_id, String type) {
api.postInvite(apply_id, type, new BaseObserver<String>() {
RetrofitClient.getInstance().postInvite(apply_id, type, new BaseObserver<String>() {
@Override
public void onSubscribe(Disposable d) {

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
View File

@@ -514,7 +514,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
int msgType = message.getMsgType();
RoomMessageEvent.T text = message.getText();
LogUtils.e("消息类型：" + msgType);
switch (msgType) {
case 1001:
if (text != null) {

9
MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/MePresenter.java
View File

@@ -8,6 +8,7 @@ import com.xscm.moduleutil.bean.TasksMessage;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.bean.WalletBean;
import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.http.RetrofitClient;
import com.xscm.moduleutil.presenter.BasePresenter;
import java.lang.ref.WeakReference;
@@ -26,7 +27,7 @@ public class MePresenter extends BasePresenter<MeConacts.View> implements MeCona
@Override
public void getMyInfo() {
api.getMyInfo(new BaseObserver<UserInfo>() {
RetrofitClient.getInstance().getMyInfo(new BaseObserver<UserInfo>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
@@ -178,7 +179,7 @@ public class MePresenter extends BasePresenter<MeConacts.View> implements MeCona
@Override
public void wallet() {
api.wallet(new BaseObserver<WalletBean>() {
RetrofitClient.getInstance().wallet(new BaseObserver<WalletBean>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
@@ -196,7 +197,7 @@ public class MePresenter extends BasePresenter<MeConacts.View> implements MeCona
@Override
public void getTasksMessage() {
api.getTasksMessage(new BaseObserver<TasksMessage>() {
RetrofitClient.getInstance().getTasksMessage(new BaseObserver<TasksMessage>() {
@Override
public void onSubscribe(Disposable d) {
@@ -217,7 +218,7 @@ public class MePresenter extends BasePresenter<MeConacts.View> implements MeCona
// Type listType = new TypeToken<List<BannerModel>>() {}.getType();
// List<BannerModel> restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtils.getHomeBanner(), listType);
// MvpRef.get().setBanners(restoredRoomModels);
api.getBanners(s, new BaseObserver<List<BannerModel>>() {
RetrofitClient.getInstance().getBanners(s, new BaseObserver<List<BannerModel>>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);

14
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
View File

@@ -67,7 +67,7 @@ import java.util.Map;
public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresenter, FragmentRoomUserInfoBinding> implements RoomUserContacts.View {
private String room_id, user_id, pit_number;
private UserInfo userInfo=new UserInfo();
private UserInfo userInfo = new UserInfo();
CustomPopWindow mCustomPopWindow;
private String is_room_owner;//是否是房主
private String is_host;//是否是主持
@@ -248,7 +248,15 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
intent.putExtra("title", "举报");
startActivity(intent);
} else if (id == R.id.iv_avatar) {
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", userInfo.getUser_id() + "").navigation();
String userId = "";
if (userInfo != null) {
userId = userInfo.getUser_id() + "";
} else {
userId = user_id;
}
if (TextUtils.isEmpty(userId))
return;
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", userId).navigation();
dismiss();
} else if (id == R.id.tv_zb) {
RoomHostZBDialog dialog = new RoomHostZBDialog(getContext());
@@ -460,7 +468,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
}
this.userInfo = userInfo1;
if (userInfo==null || userInfo.getUser_code() == null || userInfo.getUser_id()==0){
if (userInfo == null || userInfo.getUser_code() == null || userInfo.getUser_id() == 0) {
ToastUtils.show("用户数据错误，稍后重试");
return;
}

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

@@ -418,6 +418,7 @@
android:layout_height="0dp"
android:orientation="horizontal"
android:visibility="gone"
android:elevation="@dimen/dp_10"
app:layout_constraintBottom_toTopOf="@id/ll_bottom"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -427,8 +428,8 @@
<!-- </ScrollView>-->
<View
android:id="@+id/svga_gift"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -437,11 +438,12 @@
<!--礼物连送图标-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/gift_show_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:layout_marginTop="200dp"
android:layout_marginEnd="15dp"
android:visibility="gone"
android:elevation="@dimen/dp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/cl_first_charge"
app:layout_constraintEnd_toEndOf="parent"