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/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_main.xml b/app/src/main/res/layout/activity_main.xml index 9df1cb5..79cdaa0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,89 +1,8 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + - - - - - - - - - - - - - - - - - - - - - -