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

合并

Browse Source
This commit is contained in:
骆召亮
2025-11-27 11:59:19 +08:00
parent fe1ad2a732
commit fe9e192aea
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
View File

@@ -161,7 +161,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
//设置mqtt环境 false 测试环境 true 正式环境 //设置mqtt环境 false 测试环境 true 正式环境
// ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false); // ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
//设置http环境 false 测试环境 true 正式环境 //设置http环境 false 测试环境 true 正式环境
ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true); ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(false);
currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH(); currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();
initialization(); initialization();

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

@@ -106,7 +106,6 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
if (MvpPre == null) { if (MvpPre == null) {
MvpPre = bindPresenter(); MvpPre = bindPresenter();
} }
<<<<<<< HEAD
int id = view.getId(); int id = view.getId();
// 通过 ID 获取资源名称 // 通过 ID 获取资源名称
String viewName = ""; String viewName = "";
@@ -118,17 +117,6 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
LogUtils.e("点击了~" + viewName); LogUtils.e("点击了~" + viewName);
if (id == R.id.ll_youth) { if (id == R.id.ll_youth) {
=======
// 通过 ID 获取资源名称
String viewName = "";
try {
viewName = view.getContext().getResources().getResourceEntryName(view.getId());
} catch (Exception e) {
viewName = "未知View ID: " + view.getId();
}
LogUtils.e("roomUserInfoFragment","点击了" + viewName );
if (view.getId() == R.id.ll_youth) {
>>>>>>> branch_new_dev
// startActivity(new Intent(this, UnderageActivity.class)); // startActivity(new Intent(this, UnderageActivity.class));
showYouthModelDialog(); showYouthModelDialog();
} else if (id == R.id.ll_notification) { } else if (id == R.id.ll_notification) {

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

@@ -24,13 +24,9 @@ import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
<<<<<<< HEAD
import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.xscm.modulemain.Application; import com.xscm.modulemain.Application;
=======
import com.blankj.utilcode.util.LogUtils;
>>>>>>> branch_new_dev
import com.xscm.modulemain.R; import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.contacts.RoomUserContacts; import com.xscm.modulemain.activity.room.contacts.RoomUserContacts;
import com.xscm.modulemain.activity.user.activity.GiftWallActivity; import com.xscm.modulemain.activity.user.activity.GiftWallActivity;