合并 new_dev

This commit is contained in:
2025-11-26 17:27:56 +08:00
19 changed files with 343 additions and 179 deletions

View File

@@ -24,9 +24,13 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
<<<<<<< HEAD
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils;
import com.xscm.modulemain.Application;
=======
import com.blankj.utilcode.util.LogUtils;
>>>>>>> branch_new_dev
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.contacts.RoomUserContacts;
import com.xscm.modulemain.activity.user.activity.GiftWallActivity;
@@ -190,6 +194,14 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
private void onClick(View view) {
int id = view.getId();
// 通过 ID 获取资源名称
String viewName = "";
try {
viewName = view.getContext().getResources().getResourceEntryName(id);
} catch (Exception e) {
viewName = "未知View ID: " + id;
}
LogUtils.e("roomUserInfoFragment","点击了" + viewName );
if (id == R.id.room_m_cz) {
if (mBinding.roomMCz.getText().equals("上麦")) {
MvpPre.applyPit(room_id, "");
@@ -228,6 +240,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
pit_number = "";
}
userInfo.setPit_number(pit_number);
LogUtils.e("RoomGiftDialogFragment_userinfo");
RoomGiftDialogFragment.show(null, userInfo, room_id, 0, "", getParentFragmentManager());
}
dismiss();