From 225a966f88fb4275753548beebdd265f5d3940af Mon Sep 17 00:00:00 2001 From: fengge <844143714@qq.com> Date: Sat, 18 Apr 2026 16:52:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.gitignore | 6 +- app/build.gradle.kts | 4 +- .../com/stand/standapp/AndroidInterface.kt | 2 +- .../java/com/stand/standapp/MainActivity.kt | 65 ++++++------- app/src/main/res/layout/activity_login.xml | 46 ++++++---- app/src/main/res/layout/activity_main.xml | 91 +------------------ app/src/main/res/layout/activity_main1.xml | 89 ++++++++++++++++++ 7 files changed, 164 insertions(+), 139 deletions(-) create mode 100644 app/src/main/res/layout/activity_main1.xml diff --git a/app/.gitignore b/app/.gitignore index 42afabf..0b8938f 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,5 @@ -/build \ No newline at end of file +/build +/release/baselineProfiles/0/app-release.dm +/release/baselineProfiles/1/app-release.dm +/release/app-release-V1.0.3.apk +/release/output-metadata.json diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e9366a3..f43ecd5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "com.stand.standapp" minSdk = 24 targetSdk = 34 - versionCode = 3 - versionName = "1.0.2" + versionCode = 5 + versionName = "1.0.4" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/stand/standapp/AndroidInterface.kt b/app/src/main/java/com/stand/standapp/AndroidInterface.kt index c4369ba..e93fc77 100644 --- a/app/src/main/java/com/stand/standapp/AndroidInterface.kt +++ b/app/src/main/java/com/stand/standapp/AndroidInterface.kt @@ -173,7 +173,7 @@ class AndroidInterface(private val activity: MainActivity) { fun onPageFinished() { Handler(Looper.getMainLooper()).post { try { - activity.cancelTimeoutTimer() +// activity.cancelTimeoutTimer() activity.findViewById(R.id.loading_layout)?.visibility = android.view.View.GONE } catch (e: Exception) { Log.e("UI", "隐藏加载布局失败", e) diff --git a/app/src/main/java/com/stand/standapp/MainActivity.kt b/app/src/main/java/com/stand/standapp/MainActivity.kt index 8b0512a..e24ae6c 100644 --- a/app/src/main/java/com/stand/standapp/MainActivity.kt +++ b/app/src/main/java/com/stand/standapp/MainActivity.kt @@ -13,12 +13,12 @@ import com.stand.standapp.R class MainActivity : AppCompatActivity() { private var mAgentWeb: AgentWeb? = null - private val mHandler = android.os.Handler(android.os.Looper.getMainLooper()) - private val TIMEOUT_MS = 30000L - - private val timeoutRunnable = Runnable { - showErrorPage() - } +// private val mHandler = android.os.Handler(android.os.Looper.getMainLooper()) +// private val TIMEOUT_MS = 30000L +// +// private val timeoutRunnable = Runnable { +// showErrorPage() +// } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -29,15 +29,16 @@ class MainActivity : AppCompatActivity() { val container = findViewById(R.id.container) if (container == null) return - findViewById(R.id.btn_retry)?.setOnClickListener { - hideErrorPage() - mAgentWeb?.webCreator?.webView?.reload() - startTimeoutTimer() - } +// findViewById(R.id.btn_retry)?.setOnClickListener { +// hideErrorPage() +// mAgentWeb?.webCreator?.webView?.reload() +// startTimeoutTimer() +// } // 从配置中获取服务器地址 val serverUrl = AppConfig.getServerUrl(this) - val finalUrl = "$serverUrl/example/print_demo.html?t=${System.currentTimeMillis()}" + val finalUrl = "$serverUrl/example/print_demo.html?t=\${System.currentTimeMillis()}" +// val finalUrl = "$serverUrl/example/print_demo.html?t=${System.currentTimeMillis()}" Log.d("MainActivity", "Loading URL: $finalUrl") mAgentWeb = AgentWeb.with(this) @@ -48,7 +49,7 @@ class MainActivity : AppCompatActivity() { .ready() .go(finalUrl) - startTimeoutTimer() +// startTimeoutTimer() // 配置 WebView 属性以支持 SSE 和跨域 @@ -119,26 +120,26 @@ class MainActivity : AppCompatActivity() { override fun onDestroy() { mAgentWeb?.webLifeCycle?.onDestroy() - cancelTimeoutTimer() +// cancelTimeoutTimer() super.onDestroy() } - private fun startTimeoutTimer() { - cancelTimeoutTimer() - mHandler.postDelayed(timeoutRunnable, TIMEOUT_MS) - } - - fun cancelTimeoutTimer() { - mHandler.removeCallbacks(timeoutRunnable) - } - - private fun showErrorPage() { - findViewById(R.id.loading_layout)?.visibility = android.view.View.GONE - findViewById(R.id.error_layout)?.visibility = android.view.View.VISIBLE - } - - private fun hideErrorPage() { - findViewById(R.id.error_layout)?.visibility = android.view.View.GONE - findViewById(R.id.loading_layout)?.visibility = android.view.View.VISIBLE - } +// private fun startTimeoutTimer() { +// cancelTimeoutTimer() +// mHandler.postDelayed(timeoutRunnable, TIMEOUT_MS) +// } +// +// fun cancelTimeoutTimer() { +// mHandler.removeCallbacks(timeoutRunnable) +// } +// +// private fun showErrorPage() { +// findViewById(R.id.loading_layout)?.visibility = android.view.View.GONE +// findViewById(R.id.error_layout)?.visibility = android.view.View.VISIBLE +// } +// +// private fun hideErrorPage() { +// findViewById(R.id.error_layout)?.visibility = android.view.View.GONE +// findViewById(R.id.loading_layout)?.visibility = android.view.View.VISIBLE +// } } diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 18bafe5..1c28885 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,5 +1,6 @@ @@ -41,26 +42,36 @@ android:textStyle="bold" /> - - + android:layout_centerInParent="true"> - + android:background="@drawable/shape_login_box" + android:elevation="8dp" + android:gravity="center_horizontal" + android:orientation="vertical" + android:padding="30dp" + app:layout_constraintWidth_max="450dp" + app:layout_constraintWidth_default="percent" + app:layout_constraintWidth_percent="0.85" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent"> - + + - + + - + android:layout_height="match_parent" + android:orientation="vertical"> + - - - - - - - - - - - - - - - - - - - - - -