From 5cafd2ac1df079df9e2ff0f58cb2b3beeb2a15e4 Mon Sep 17 00:00:00 2001
From: maxinyu <maxinyu@chengkong.com>
Date: Mon, 8 Jun 2026 10:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=AF=E5=8A=A8=E9=A1=B5?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 20 ++++++-----
 .../defenseapplication/MyApplication.kt       |  5 ---
 .../defenseapplication/home/StartActivity.kt  | 36 +++++++++++++++++++
 .../liveVideo/LiveVideoActivity.kt            | 11 ++----
 .../defenseapplication/login/LoginActivity.kt |  8 -----
 app/src/main/res/layout/activity_start.xml    | 23 ++++++++++++
 6 files changed, 73 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/java/com/example/defenseapplication/home/StartActivity.kt
 create mode 100644 app/src/main/res/layout/activity_start.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 38668ea..e13fe58 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,6 +27,15 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.DefenseApplication">
+        <activity
+            android:name=".home.StartActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".personal.LoginPasswordActivity"
             android:exported="false" />
@@ -109,7 +118,8 @@
             android:exported="false" />
         <activity
             android:name=".home.HomeActivity"
-            android:exported="false" />
+            android:exported="false">
+        </activity>
         <activity
             android:name=".login.RegisterSuccessActivity"
             android:exported="false" />
@@ -127,13 +137,7 @@
             android:exported="false" />
         <activity
             android:name=".login.LoginActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+            android:exported="false" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/com/example/defenseapplication/MyApplication.kt b/app/src/main/java/com/example/defenseapplication/MyApplication.kt
index a99a17c..d282655 100644
--- a/app/src/main/java/com/example/defenseapplication/MyApplication.kt
+++ b/app/src/main/java/com/example/defenseapplication/MyApplication.kt
@@ -15,11 +15,6 @@ class MyApplication : Application() {
     override fun onCreate() {
         super.onCreate()
         Utils.init(this)    // 初始化 AndroidUtilCode
-
-        var token = UserinfoUtil.getUserInfo()?.access_token;
-        if (token != null) {
-            ApiConfig.authToken = token
-        };
         LanguageUtil.init(this)
     }
 
diff --git a/app/src/main/java/com/example/defenseapplication/home/StartActivity.kt b/app/src/main/java/com/example/defenseapplication/home/StartActivity.kt
new file mode 100644
index 0000000..dce7af9
--- /dev/null
+++ b/app/src/main/java/com/example/defenseapplication/home/StartActivity.kt
@@ -0,0 +1,36 @@
+package com.example.defenseapplication.home
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import androidx.appcompat.app.AppCompatActivity
+import com.example.defenseapplication.databinding.ActivityStartBinding
+import com.example.defenseapplication.login.LoginActivity
+import com.example.defenseapplication.utils.ApiConfig
+import com.example.defenseapplication.utils.UserinfoUtil
+
+class StartActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityStartBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityStartBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        // 延迟2秒后再判断登录状态
+        Handler(Looper.getMainLooper()).postDelayed({
+            val userInfo = UserinfoUtil.getUserInfo()
+            if (userInfo != null) {
+                // 设置token
+                ApiConfig.authToken = userInfo.access_token
+                val intent = Intent(this, HomeActivity::class.java)
+                startActivity(intent)
+            } else {
+                val intent = Intent(this, LoginActivity::class.java)
+                startActivity(intent)
+            }
+            finish()
+        }, 2000) // 2秒延迟
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt
index 4de2739..a6d6c25 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt
@@ -1,17 +1,11 @@
 package com.example.defenseapplication.liveVideo
 
-import android.content.Context
 import android.content.Intent
-import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.graphics.Color
-import android.media.AudioManager
 import android.os.Bundle
 import android.util.Log
 import android.view.View
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.example.defenseapplication.R
@@ -21,9 +15,7 @@ import com.example.defenseapplication.bean.DeviceAlarmBean
 import com.example.defenseapplication.databinding.LiveVideoActivityBinding
 import com.example.defenseapplication.utils.ActivityManager
 import com.example.defenseapplication.utils.RetrofitNetwork
-import com.example.defenseapplication.view.MyGSYVideoPlayer
 import com.gyf.immersionbar.ImmersionBar
-import com.shuyu.gsyvideoplayer.GSYVideoManager
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder
 import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack
 import com.shuyu.gsyvideoplayer.utils.OrientationUtils
@@ -99,7 +91,8 @@ class LiveVideoActivity : BaseActivity() {
             .setLockLand(false)
             .setShowFullAnimation(true)
             .setNeedShowWifiTip(false)
-
+            .setEnlargeImageRes(R.drawable.full_size)
+            .setShrinkImageRes(R.drawable.full_screen)
             .setVideoAllCallBack(object : GSYSampleCallBack() {
                 override fun onPrepared(url: String?, vararg objects: Any?) {
                     super.onPrepared(url, *objects)
diff --git a/app/src/main/java/com/example/defenseapplication/login/LoginActivity.kt b/app/src/main/java/com/example/defenseapplication/login/LoginActivity.kt
index 003af94..88da86d 100644
--- a/app/src/main/java/com/example/defenseapplication/login/LoginActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/login/LoginActivity.kt
@@ -32,14 +32,6 @@ class LoginActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         
-        if (UserinfoUtil.getUserInfo() != null) {
-            val intent = Intent(this, HomeActivity::class.java)
-            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-            startActivity(intent)
-            finish()
-            return
-        }
-        
         binding = ActivityLoginBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml
new file mode 100644
index 0000000..82683c9
--- /dev/null
+++ b/app/src/main/res/layout/activity_start.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    tools:context=".home.StartActivity">
+
+    <!-- Logo 图片：横竖屏均居中 -->
+    <ImageView
+        android:id="@+id/logoFrame"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:src="@mipmap/loge1"
+        android:padding="5dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file