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

fix bugs. add 字体流光 自定义view,cos上传报错信息。

Browse Source
This commit is contained in:
骆召亮
2025-11-14 17:38:30 +08:00
parent 68b4a66046
commit 3322cfeb22
78 changed files with 1278 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MainModule/src/main/java/com/xscm/modulemain/dialog/HourlyChartDialog.java
View File

@@ -15,11 +15,11 @@ import com.xscm.modulemain.activity.room.contacts.HourlyChartContacts;
import com.xscm.modulemain.activity.room.presenter.HourlyChartPresenter;
import com.xscm.modulemain.adapter.RoomHourlyAdapter;
import com.xscm.modulemain.databinding.DialogHourlyChartFragmentBinding;
import com.xscm.modulemain.manager.RoomManager;
import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.room.RoomHourBean;
import org.greenrobot.eventbus.EventBus;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
@@ -129,7 +129,8 @@ public class HourlyChartDialog extends BaseMvpDialogFragment<HourlyChartPresente
@Override
public void onItemClick(RoomHourBean.RoomListBean item, int position) {
RoomManager.getInstance().fetchRoomDataAndEnter(getActivity(), item.getRoom_id(),"",null);
// RoomManager.getInstance().fetchRoomDataAndEnter(getActivity(), item.getRoom_id(),"",null);
EventBus.getDefault().post(item);
dismiss();
}
});

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

@@ -10,6 +10,7 @@ import android.graphics.Color;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentManager;
import android.view.Gravity;
@@ -105,6 +106,12 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
MvpPre.getRoomUserInfo(room_id, user_id);
}
@Override
protected void initDialogStyle(Window window) {
super.initDialogStyle(window);
@@ -123,7 +130,6 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
@Override
protected void initData() {
MvpPre.getRoomUserInfo(room_id, user_id);
if (type == 0) {
mBinding.roomDian.setVisibility(GONE);
} else {
@@ -381,7 +387,16 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
String sex = userInfo.getSex()==1?"男":"女";
mBinding.tvId.setText(sex+" | ID:"+userInfo.getUser_code());
mBinding.tvName.setText(userInfo.getNickname());
mBinding.tvName.setTextColor( (userInfo.getNickname_color()!=null && !userInfo.getNickname_color().equals(""))? Color.parseColor(userInfo.getNickname_color()):Color.parseColor("#333333"));
if (!userInfo.getNickname_color().isEmpty()){
mBinding.tvName.setStartColor(Color.parseColor(userInfo.getNickname_color()));
mBinding.tvName.setShineColor(Color.parseColor(userInfo.getNickname_color()));
mBinding.tvName.setEndColor(Color.parseColor(userInfo.getNickname_color()));
mBinding.tvName.setShine(true);
mBinding.tvName.setShineType(0);
}
// mBinding.tvName.setTextColor( (userInfo.getNickname_color()!=null && !userInfo.getNickname_color().equals(""))? Color.parseColor(userInfo.getNickname_color()):Color.parseColor("#333333"));
// mBinding.tvId.setText("ID:" + userInfo.getUser_code());
if (userInfo.getIs_in_pit() == 1) {
mBinding.roomMCz.setText("下麦");