合并

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

@@ -106,7 +106,6 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
         if (MvpPre == null) {
             MvpPre = bindPresenter();
         }
-<<<<<<< HEAD
         int id = view.getId();
         // 通过 ID 获取资源名称
         String viewName = "";
@@ -118,17 +117,6 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
         LogUtils.e("点击了~" + viewName);
 
         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));
             showYouthModelDialog();
         } else if (id == R.id.ll_notification) {