From 41cd82123349b7f2bf5521ed07412a384e3ee2d8 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Mon, 22 Jan 2024 14:00:06 +0800
Subject: [PATCH] =?UTF-8?q?chore:=E8=B0=83=E6=95=B4App=E5=AD=90=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                               | 2 +-
 app/src/main/java/com/nnbc123/app/guide/UserGuideActivity.java | 2 +-
 .../main/java/com/nnbc123/app/home/helper/OpenRoomHelper.java  | 2 +-
 app/src/main/java/com/nnbc123/app/{ => main}/MainActivity.java | 3 ++-
 .../java/com/nnbc123/app/other/activity/SplashActivity.java    | 2 +-
 app/src/main/java/com/nnbc123/app/ui/agent/AgentActivity.java  | 2 +-
 app/src/main/java/com/nnbc123/app/ui/im/NimMiddleActivity.java | 2 +-
 app/src/main/java/com/nnbc123/app/utils/RegexUtil.java         | 2 +-
 app/src/main/res/layout/activity_main.xml                      | 2 +-
 .../dialog/GrabApprenticesNoticeDialog.java                    | 2 +-
 10 files changed, 11 insertions(+), 10 deletions(-)
 rename app/src/main/java/com/nnbc123/app/{ => main}/MainActivity.java (99%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 806bced6d..0df957933 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -374,7 +374,7 @@
             android:name="com.nnbc123.app.ui.search.SearchUserActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.nnbc123.app.MainActivity"
+            android:name="com.nnbc123.app.main.MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="音萌"
             android:launchMode="singleTask"
diff --git a/app/src/main/java/com/nnbc123/app/guide/UserGuideActivity.java b/app/src/main/java/com/nnbc123/app/guide/UserGuideActivity.java
index 89c31b615..72e0071b7 100644
--- a/app/src/main/java/com/nnbc123/app/guide/UserGuideActivity.java
+++ b/app/src/main/java/com/nnbc123/app/guide/UserGuideActivity.java
@@ -7,7 +7,7 @@ import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.nnbc123.app.MainActivity;
+import com.nnbc123.app.main.MainActivity;
 import com.nnbc123.app.R;
 import com.nnbc123.app.base.BaseActivity;
 import com.nnbc123.core.PreferencesUtils;
diff --git a/app/src/main/java/com/nnbc123/app/home/helper/OpenRoomHelper.java b/app/src/main/java/com/nnbc123/app/home/helper/OpenRoomHelper.java
index b248f8c8e..dbfa80558 100644
--- a/app/src/main/java/com/nnbc123/app/home/helper/OpenRoomHelper.java
+++ b/app/src/main/java/com/nnbc123/app/home/helper/OpenRoomHelper.java
@@ -13,7 +13,7 @@ import android.text.style.ForegroundColorSpan;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 
-import com.nnbc123.app.MainActivity;
+import com.nnbc123.app.main.MainActivity;
 import com.nnbc123.app.R;
 import com.nnbc123.app.avroom.activity.AVRoomActivity;
 import com.nnbc123.app.avroom.dialog.CreateRoomDialog;
diff --git a/app/src/main/java/com/nnbc123/app/MainActivity.java b/app/src/main/java/com/nnbc123/app/main/MainActivity.java
similarity index 99%
rename from app/src/main/java/com/nnbc123/app/MainActivity.java
rename to app/src/main/java/com/nnbc123/app/main/MainActivity.java
index 92663f811..c7db2e102 100644
--- a/app/src/main/java/com/nnbc123/app/MainActivity.java
+++ b/app/src/main/java/com/nnbc123/app/main/MainActivity.java
@@ -1,4 +1,4 @@
-package com.nnbc123.app;
+package com.nnbc123.app.main;
 
 import static com.nnbc123.core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE;
 
@@ -36,6 +36,7 @@ import com.netease.nimlib.sdk.team.TeamService;
 import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum;
 import com.netease.nimlib.sdk.team.model.Team;
 import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
+import com.nnbc123.app.R;
 import com.nnbc123.app.application.ActivityStackManager;
 import com.nnbc123.app.avroom.activity.AVRoomActivity;
 import com.nnbc123.app.avroom.newuserchargegift.NewUserChargeGiftDialog;
diff --git a/app/src/main/java/com/nnbc123/app/other/activity/SplashActivity.java b/app/src/main/java/com/nnbc123/app/other/activity/SplashActivity.java
index e4ef604fc..cf043d145 100644
--- a/app/src/main/java/com/nnbc123/app/other/activity/SplashActivity.java
+++ b/app/src/main/java/com/nnbc123/app/other/activity/SplashActivity.java
@@ -15,7 +15,7 @@ import com.bumptech.glide.request.RequestOptions;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.support.glide.GlideApp;
 import com.nnbc123.library.common.util.DeviceUtil;
-import com.nnbc123.app.MainActivity;
+import com.nnbc123.app.main.MainActivity;
 import com.nnbc123.app.ui.im.NimMiddleActivity;
 import com.nnbc123.app.R;
 import com.nnbc123.app.application.XChatApplication;
diff --git a/app/src/main/java/com/nnbc123/app/ui/agent/AgentActivity.java b/app/src/main/java/com/nnbc123/app/ui/agent/AgentActivity.java
index 0f0049a5d..e62dedf12 100644
--- a/app/src/main/java/com/nnbc123/app/ui/agent/AgentActivity.java
+++ b/app/src/main/java/com/nnbc123/app/ui/agent/AgentActivity.java
@@ -11,7 +11,7 @@ import com.mob.moblink.MobLink;
 import com.mob.moblink.Scene;
 import com.mob.moblink.SceneRestorable;
 import com.netease.nim.uikit.common.util.log.LogUtil;
-import com.nnbc123.app.MainActivity;
+import com.nnbc123.app.main.MainActivity;
 import com.nnbc123.app.other.activity.SplashActivity;
 import com.nnbc123.core.linked.LinkedModel;
 import com.nnbc123.core.linked.bean.LinkedInfo;
diff --git a/app/src/main/java/com/nnbc123/app/ui/im/NimMiddleActivity.java b/app/src/main/java/com/nnbc123/app/ui/im/NimMiddleActivity.java
index 12e668cd8..869771929 100644
--- a/app/src/main/java/com/nnbc123/app/ui/im/NimMiddleActivity.java
+++ b/app/src/main/java/com/nnbc123/app/ui/im/NimMiddleActivity.java
@@ -7,7 +7,7 @@ import android.util.Log;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.coorchice.library.utils.LogUtils;
-import com.nnbc123.app.MainActivity;
+import com.nnbc123.app.main.MainActivity;
 import com.nnbc123.app.utils.UserUtils;
 import com.netease.nimlib.sdk.NimIntent;
 import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
diff --git a/app/src/main/java/com/nnbc123/app/utils/RegexUtil.java b/app/src/main/java/com/nnbc123/app/utils/RegexUtil.java
index 94739c397..523e41205 100644
--- a/app/src/main/java/com/nnbc123/app/utils/RegexUtil.java
+++ b/app/src/main/java/com/nnbc123/app/utils/RegexUtil.java
@@ -55,7 +55,7 @@ public class RegexUtil {
     }
 
     public static String getNotPrintableStringReg() {
-        //  bug-fixed java.lang.RuntimeException:Unable to resume activity {com.nnbc123.app/com.nnbc123.app.MainActivity}: kotlin.KotlinNullPointerException
+        //  bug-fixed java.lang.RuntimeException:Unable to resume activity {com.nnbc123.app/com.nnbc123.app.main.MainActivity}: kotlin.KotlinNullPointerException
         return TextUtils.isEmpty(NOT_VISIBLE_CHARS) ? "" : NOT_VISIBLE_CHARS;
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index adb7fd557..7acc27021 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.nnbc123.app.MainActivity">
+    tools:context="com.nnbc123.app.main.MainActivity">
 
     <FrameLayout
         android:id="@+id/main_fragment"
diff --git a/app/src/module_mentoring_relationship/java/com/nnbc123/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java b/app/src/module_mentoring_relationship/java/com/nnbc123/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java
index 542ac42c8..4fc13095f 100644
--- a/app/src/module_mentoring_relationship/java/com/nnbc123/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java
+++ b/app/src/module_mentoring_relationship/java/com/nnbc123/app/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java
@@ -21,7 +21,7 @@ import android.widget.ImageView;
 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.nnbc123.app.MainActivity;
+import com.nnbc123.app.main.MainActivity;
 import com.nnbc123.app.R;
 import com.nnbc123.app.avroom.activity.AVRoomActivity;
 import com.nnbc123.app.common.permission.StatusBarCompat;