Merge branch 'new_master' into new_for_phone

app/src/main/AndroidManifest.xml

@@ -22,7 +22,7 @@
         android:supportsRtl="true"
         android:name=".RootApp"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity"
+        <activity android:name=".activity.MainActivity"
             android:launchMode="singleInstance"
             android:screenOrientation="landscape">
             <intent-filter>

app/src/main/java/com/bgycc/smartcanteen/MainActivity.java → app/src/main/java/com/bgycc/smartcanteen/activity/MainActivity.java

-package com.bgycc.smartcanteen;
+package com.bgycc.smartcanteen.activity;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.widget.ConstraintLayout;
@@ -25,6 +25,9 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.bgycc.smartcanteen.BuildConfig;
+import com.bgycc.smartcanteen.Injection;
+import com.bgycc.smartcanteen.R;
 import com.bgycc.smartcanteen.entity.PayData;
 import com.bgycc.smartcanteen.executor.SCTaskExecutor;
 import com.bgycc.smartcanteen.socket.SCWebSocketClient;

app/src/main/java/com/bgycc/smartcanteen/broadcast/BootBroadcast.java

@@ -5,8 +5,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.bgycc.smartcanteen.MainActivity;
+import com.bgycc.smartcanteen.activity.MainActivity;
 
+// 开机广播，保证设备启动后应用能被主动唤起
 public class BootBroadcast extends BroadcastReceiver {
     @SuppressLint("UnsafeProtectedBroadcastReceiver")
     @Override

app/src/main/java/com/bgycc/smartcanteen/utils/InstallManager.java

@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.os.Build;
 
 import com.bgycc.smartcanteen.BuildConfig;
-import com.bgycc.smartcanteen.MainActivity;
+import com.bgycc.smartcanteen.activity.MainActivity;
 import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.FileUtils;
 import com.blankj.utilcode.util.LogUtils;

daemon/src/main/java/com/bgycc/smartcanteen/daemon/DaemonService.java

@@ -22,7 +22,7 @@ public class DaemonService extends Service {
     // 主应用package name
     private static final String MAIN_PACKAGE_NAME = "com.bgycc.smartcanteen";
     // 主应用类名称
-    private static final String MAIN_ACTIVITY_NAME = "com.bgycc.smartcanteen.MainActivity";
+    private static final String MAIN_ACTIVITY_NAME = "com.bgycc.smartcanteen.activity.MainActivity";
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {