diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt index ca057dd..164ced0 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt @@ -38,7 +38,8 @@ private val broadcastManager by lazy { BroadcastManager(requireContext()) } private val wifi by lazy { requireContext().getSystemService()!! } private var isGetBoardConfig = false - private var isUseWithAI = false + private var isGetAlgorithmConfig = false + private var isUseAlgorithm = false private var isGetServerConfig = false override fun initOnCreate(savedInstanceState: Bundle?) { @@ -102,15 +103,19 @@ while (!isGetBoardConfig) { //查询主控板IP、子网掩码、网关IP SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_BOARD_CONFIG_CODE) - delay(2000) + delay(1000) } - while (!isUseWithAI) { + delay(500) + + while (!isGetAlgorithmConfig) { //查询是否配合一体机使用 SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_IS_USE_AI_CODE) - delay(1500) + delay(1000) } + delay(500) + while (!isGetServerConfig) { //查询服务器IP、端口 SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_SERVER_CONFIG_CODE) @@ -131,7 +136,7 @@ val weakReferenceHandler = SocketConnectionService.weakReferenceHandler ?: return@setOnClickListener lifecycleScope.launch(Dispatchers.IO) { - if (isUseWithAI) { + if (!isUseAlgorithm) { val serverHost = binding.serverHostView.text.toString() val serverPort = binding.serverPortView.text.toString() if (serverHost.isNotBlank() && serverPort.isNotBlank()) { @@ -162,13 +167,14 @@ } LocaleConstant.QUERY_IS_USE_AI_RESPONSE_CODE -> { - //如果配合一体机使用,该项出厂时配置为0,否则出厂时配置为1 + //配合一体机使用-0,单独使用-1 val state = msg.obj as String + isGetAlgorithmConfig = true if (state == "0") { - isUseWithAI = true + isUseAlgorithm = true binding.serverLayout.visibility = View.GONE } else { - isUseWithAI = false + isUseAlgorithm = false binding.serverLayout.visibility = View.VISIBLE } } diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt index ca057dd..164ced0 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt @@ -38,7 +38,8 @@ private val broadcastManager by lazy { BroadcastManager(requireContext()) } private val wifi by lazy { requireContext().getSystemService()!! } private var isGetBoardConfig = false - private var isUseWithAI = false + private var isGetAlgorithmConfig = false + private var isUseAlgorithm = false private var isGetServerConfig = false override fun initOnCreate(savedInstanceState: Bundle?) { @@ -102,15 +103,19 @@ while (!isGetBoardConfig) { //查询主控板IP、子网掩码、网关IP SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_BOARD_CONFIG_CODE) - delay(2000) + delay(1000) } - while (!isUseWithAI) { + delay(500) + + while (!isGetAlgorithmConfig) { //查询是否配合一体机使用 SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_IS_USE_AI_CODE) - delay(1500) + delay(1000) } + delay(500) + while (!isGetServerConfig) { //查询服务器IP、端口 SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_SERVER_CONFIG_CODE) @@ -131,7 +136,7 @@ val weakReferenceHandler = SocketConnectionService.weakReferenceHandler ?: return@setOnClickListener lifecycleScope.launch(Dispatchers.IO) { - if (isUseWithAI) { + if (!isUseAlgorithm) { val serverHost = binding.serverHostView.text.toString() val serverPort = binding.serverPortView.text.toString() if (serverHost.isNotBlank() && serverPort.isNotBlank()) { @@ -162,13 +167,14 @@ } LocaleConstant.QUERY_IS_USE_AI_RESPONSE_CODE -> { - //如果配合一体机使用,该项出厂时配置为0,否则出厂时配置为1 + //配合一体机使用-0,单独使用-1 val state = msg.obj as String + isGetAlgorithmConfig = true if (state == "0") { - isUseWithAI = true + isUseAlgorithm = true binding.serverLayout.visibility = View.GONE } else { - isUseWithAI = false + isUseAlgorithm = false binding.serverLayout.visibility = View.VISIBLE } } diff --git a/app/src/main/res/layout/fragment_base_settings.xml b/app/src/main/res/layout/fragment_base_settings.xml index 1d851d3..2026d9c 100644 --- a/app/src/main/res/layout/fragment_base_settings.xml +++ b/app/src/main/res/layout/fragment_base_settings.xml @@ -226,9 +226,11 @@ android:layout_marginHorizontal="@dimen/dp_20" android:layout_weight="2.25" android:background="@drawable/bg_solid_layout_white_radius_5" + android:hint="数据获取中,请稍后..." android:padding="@dimen/dp_5" android:singleLine="true" android:textColor="@color/black" + android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_16" /> @@ -254,10 +256,12 @@ android:layout_marginHorizontal="@dimen/dp_20" android:layout_weight="2.25" android:background="@drawable/bg_solid_layout_white_radius_5" + android:hint="数据获取中,请稍后..." android:inputType="number" android:padding="@dimen/dp_5" android:singleLine="true" android:textColor="@color/black" + android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_16" />