diff --git a/app/build.gradle b/app/build.gradle index 157c592..35da2a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/build.gradle b/app/build.gradle index 157c592..35da2a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9492397..4f8f4c1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,7 +69,6 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> - + android:value="e55914bf5235959106281ba7cf277897" /> diff --git a/app/build.gradle b/app/build.gradle index 157c592..35da2a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9492397..4f8f4c1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,7 +69,6 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> - + android:value="e55914bf5235959106281ba7cf277897" /> diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index e2a34cf..4677940 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,8 +49,7 @@ ) } -// const val SERVER_BASE_URL = "http://192.168.9.99:8085" - const val SERVER_BASE_URL = "http://139.198.19.235:22006" + const val SERVER_BASE_URL = "http://111.198.10.15:22005" //一体机DeviceMonitor程序TCP Server IP地址 const val GAS_BASE_IP = "192.168.10.139" diff --git a/app/build.gradle b/app/build.gradle index 157c592..35da2a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9492397..4f8f4c1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,7 +69,6 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> - + android:value="e55914bf5235959106281ba7cf277897" /> diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index e2a34cf..4677940 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,8 +49,7 @@ ) } -// const val SERVER_BASE_URL = "http://192.168.9.99:8085" - const val SERVER_BASE_URL = "http://139.198.19.235:22006" + const val SERVER_BASE_URL = "http://111.198.10.15:22005" //一体机DeviceMonitor程序TCP Server IP地址 const val GAS_BASE_IP = "192.168.10.139" diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index 30fc847..440af43 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -204,7 +204,7 @@ regionViewModel.setVideoRegion("YTJ_010001", region) } - binding.leftButton.setOnTouchListener { _, event -> + binding.leftControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Left") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -212,7 +212,7 @@ false } - binding.topButton.setOnTouchListener { _, event -> + binding.topControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Up") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -220,7 +220,7 @@ false } - binding.rightButton.setOnTouchListener { _, event -> + binding.rightControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Right") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -228,7 +228,7 @@ false } - binding.bottomButton.setOnTouchListener { _, event -> + binding.bottomControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Down") MotionEvent.ACTION_UP -> executeCommand("Stop") diff --git a/app/build.gradle b/app/build.gradle index 157c592..35da2a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9492397..4f8f4c1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,7 +69,6 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> - + android:value="e55914bf5235959106281ba7cf277897" /> diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index e2a34cf..4677940 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,8 +49,7 @@ ) } -// const val SERVER_BASE_URL = "http://192.168.9.99:8085" - const val SERVER_BASE_URL = "http://139.198.19.235:22006" + const val SERVER_BASE_URL = "http://111.198.10.15:22005" //一体机DeviceMonitor程序TCP Server IP地址 const val GAS_BASE_IP = "192.168.10.139" diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index 30fc847..440af43 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -204,7 +204,7 @@ regionViewModel.setVideoRegion("YTJ_010001", region) } - binding.leftButton.setOnTouchListener { _, event -> + binding.leftControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Left") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -212,7 +212,7 @@ false } - binding.topButton.setOnTouchListener { _, event -> + binding.topControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Up") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -220,7 +220,7 @@ false } - binding.rightButton.setOnTouchListener { _, event -> + binding.rightControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Right") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -228,7 +228,7 @@ false } - binding.bottomButton.setOnTouchListener { _, event -> + binding.bottomControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Down") MotionEvent.ACTION_UP -> executeCommand("Stop") diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt deleted file mode 100644 index 3026da3..0000000 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.br.operationsite.view - -import android.graphics.Bitmap -import android.os.Bundle -import android.view.ViewGroup -import android.webkit.WebView -import android.widget.LinearLayout -import com.casic.br.operationsite.R -import com.casic.br.operationsite.databinding.ActivityDeviceControlByWebBinding -import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.utils.LocaleConstant -import com.just.agentweb.AgentWeb -import com.just.agentweb.WebViewClient -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.widget.TitleBarView - -class DeviceControlByWebActivity : KotlinBaseActivity() { - - private lateinit var agentWeb: AgentWeb - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - ActivityStackManager.addActivity(this) - agentWeb = AgentWeb.with(this).setAgentWebParent( - binding.containerView, LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT - ) - ).useDefaultIndicator().setWebViewClient(object : WebViewClient() { - override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) { - - } - - override fun onPageFinished(view: WebView?, url: String?) { - - } - }).setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) - .interceptUnkownUrl() - .createAgentWeb() - .ready() - .go(LocaleConstant.DEVICE_CONTROL_URL) - val webView = agentWeb.webCreator.webView - webView.settings.useWideViewPort = true - webView.settings.builtInZoomControls = true - webView.settings.setSupportZoom(true) - webView.settings.displayZoomControls = false - webView.setInitialScale(4) - } - - override fun initViewBinding(): ActivityDeviceControlByWebBinding { - return ActivityDeviceControlByWebBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - - } - }) - } - - override fun onResume() { - super.onResume() - agentWeb.webLifeCycle.onResume() - } - - override fun onPause() { - agentWeb.webLifeCycle.onPause() - super.onPause() - } - - override fun onDestroy() { - agentWeb.webLifeCycle.onDestroy() - super.onDestroy() - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 157c592..35da2a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9492397..4f8f4c1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,7 +69,6 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> - + android:value="e55914bf5235959106281ba7cf277897" /> diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index e2a34cf..4677940 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,8 +49,7 @@ ) } -// const val SERVER_BASE_URL = "http://192.168.9.99:8085" - const val SERVER_BASE_URL = "http://139.198.19.235:22006" + const val SERVER_BASE_URL = "http://111.198.10.15:22005" //一体机DeviceMonitor程序TCP Server IP地址 const val GAS_BASE_IP = "192.168.10.139" diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index 30fc847..440af43 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -204,7 +204,7 @@ regionViewModel.setVideoRegion("YTJ_010001", region) } - binding.leftButton.setOnTouchListener { _, event -> + binding.leftControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Left") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -212,7 +212,7 @@ false } - binding.topButton.setOnTouchListener { _, event -> + binding.topControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Up") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -220,7 +220,7 @@ false } - binding.rightButton.setOnTouchListener { _, event -> + binding.rightControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Right") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -228,7 +228,7 @@ false } - binding.bottomButton.setOnTouchListener { _, event -> + binding.bottomControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Down") MotionEvent.ACTION_UP -> executeCommand("Stop") diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt deleted file mode 100644 index 3026da3..0000000 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.br.operationsite.view - -import android.graphics.Bitmap -import android.os.Bundle -import android.view.ViewGroup -import android.webkit.WebView -import android.widget.LinearLayout -import com.casic.br.operationsite.R -import com.casic.br.operationsite.databinding.ActivityDeviceControlByWebBinding -import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.utils.LocaleConstant -import com.just.agentweb.AgentWeb -import com.just.agentweb.WebViewClient -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.widget.TitleBarView - -class DeviceControlByWebActivity : KotlinBaseActivity() { - - private lateinit var agentWeb: AgentWeb - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - ActivityStackManager.addActivity(this) - agentWeb = AgentWeb.with(this).setAgentWebParent( - binding.containerView, LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT - ) - ).useDefaultIndicator().setWebViewClient(object : WebViewClient() { - override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) { - - } - - override fun onPageFinished(view: WebView?, url: String?) { - - } - }).setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) - .interceptUnkownUrl() - .createAgentWeb() - .ready() - .go(LocaleConstant.DEVICE_CONTROL_URL) - val webView = agentWeb.webCreator.webView - webView.settings.useWideViewPort = true - webView.settings.builtInZoomControls = true - webView.settings.setSupportZoom(true) - webView.settings.displayZoomControls = false - webView.setInitialScale(4) - } - - override fun initViewBinding(): ActivityDeviceControlByWebBinding { - return ActivityDeviceControlByWebBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - - } - }) - } - - override fun onResume() { - super.onResume() - agentWeb.webLifeCycle.onResume() - } - - override fun onPause() { - agentWeb.webLifeCycle.onPause() - super.onPause() - } - - override fun onDestroy() { - agentWeb.webLifeCycle.onDestroy() - super.onDestroy() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 1e3078e..98d4ffe 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -329,7 +329,6 @@ } binding.fenceTextView.setOnClickListener { -// navigatePageTo() navigatePageTo() } diff --git a/app/build.gradle b/app/build.gradle index 157c592..35da2a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9492397..4f8f4c1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,7 +69,6 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> - + android:value="e55914bf5235959106281ba7cf277897" /> diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index e2a34cf..4677940 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,8 +49,7 @@ ) } -// const val SERVER_BASE_URL = "http://192.168.9.99:8085" - const val SERVER_BASE_URL = "http://139.198.19.235:22006" + const val SERVER_BASE_URL = "http://111.198.10.15:22005" //一体机DeviceMonitor程序TCP Server IP地址 const val GAS_BASE_IP = "192.168.10.139" diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index 30fc847..440af43 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -204,7 +204,7 @@ regionViewModel.setVideoRegion("YTJ_010001", region) } - binding.leftButton.setOnTouchListener { _, event -> + binding.leftControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Left") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -212,7 +212,7 @@ false } - binding.topButton.setOnTouchListener { _, event -> + binding.topControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Up") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -220,7 +220,7 @@ false } - binding.rightButton.setOnTouchListener { _, event -> + binding.rightControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Right") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -228,7 +228,7 @@ false } - binding.bottomButton.setOnTouchListener { _, event -> + binding.bottomControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Down") MotionEvent.ACTION_UP -> executeCommand("Stop") diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt deleted file mode 100644 index 3026da3..0000000 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.br.operationsite.view - -import android.graphics.Bitmap -import android.os.Bundle -import android.view.ViewGroup -import android.webkit.WebView -import android.widget.LinearLayout -import com.casic.br.operationsite.R -import com.casic.br.operationsite.databinding.ActivityDeviceControlByWebBinding -import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.utils.LocaleConstant -import com.just.agentweb.AgentWeb -import com.just.agentweb.WebViewClient -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.widget.TitleBarView - -class DeviceControlByWebActivity : KotlinBaseActivity() { - - private lateinit var agentWeb: AgentWeb - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - ActivityStackManager.addActivity(this) - agentWeb = AgentWeb.with(this).setAgentWebParent( - binding.containerView, LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT - ) - ).useDefaultIndicator().setWebViewClient(object : WebViewClient() { - override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) { - - } - - override fun onPageFinished(view: WebView?, url: String?) { - - } - }).setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) - .interceptUnkownUrl() - .createAgentWeb() - .ready() - .go(LocaleConstant.DEVICE_CONTROL_URL) - val webView = agentWeb.webCreator.webView - webView.settings.useWideViewPort = true - webView.settings.builtInZoomControls = true - webView.settings.setSupportZoom(true) - webView.settings.displayZoomControls = false - webView.setInitialScale(4) - } - - override fun initViewBinding(): ActivityDeviceControlByWebBinding { - return ActivityDeviceControlByWebBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - - } - }) - } - - override fun onResume() { - super.onResume() - agentWeb.webLifeCycle.onResume() - } - - override fun onPause() { - agentWeb.webLifeCycle.onPause() - super.onPause() - } - - override fun onDestroy() { - agentWeb.webLifeCycle.onDestroy() - super.onDestroy() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 1e3078e..98d4ffe 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -329,7 +329,6 @@ } binding.fenceTextView.setOnClickListener { -// navigatePageTo() navigatePageTo() } diff --git a/app/src/main/res/layout/activity_apply_enter.xml b/app/src/main/res/layout/activity_apply_enter.xml index 63e7dfc..2ef2323 100644 --- a/app/src/main/res/layout/activity_apply_enter.xml +++ b/app/src/main/res/layout/activity_apply_enter.xml @@ -12,13 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/mainThemeColor" - app:tbv_left_image="@drawable/ic_title_left" - app:tbv_only_show_title="false" - app:tbv_show_left_image="true" - app:tbv_show_right_image="false" - app:tbv_text="人员信息" - app:tbv_text_color="@color/white" - app:tbv_text_size="@dimen/sp_18" /> + app:tbv_text="人员信息" /> - + android:value="e55914bf5235959106281ba7cf277897" /> diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index e2a34cf..4677940 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,8 +49,7 @@ ) } -// const val SERVER_BASE_URL = "http://192.168.9.99:8085" - const val SERVER_BASE_URL = "http://139.198.19.235:22006" + const val SERVER_BASE_URL = "http://111.198.10.15:22005" //一体机DeviceMonitor程序TCP Server IP地址 const val GAS_BASE_IP = "192.168.10.139" diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index 30fc847..440af43 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -204,7 +204,7 @@ regionViewModel.setVideoRegion("YTJ_010001", region) } - binding.leftButton.setOnTouchListener { _, event -> + binding.leftControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Left") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -212,7 +212,7 @@ false } - binding.topButton.setOnTouchListener { _, event -> + binding.topControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Up") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -220,7 +220,7 @@ false } - binding.rightButton.setOnTouchListener { _, event -> + binding.rightControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Right") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -228,7 +228,7 @@ false } - binding.bottomButton.setOnTouchListener { _, event -> + binding.bottomControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Down") MotionEvent.ACTION_UP -> executeCommand("Stop") diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt deleted file mode 100644 index 3026da3..0000000 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.br.operationsite.view - -import android.graphics.Bitmap -import android.os.Bundle -import android.view.ViewGroup -import android.webkit.WebView -import android.widget.LinearLayout -import com.casic.br.operationsite.R -import com.casic.br.operationsite.databinding.ActivityDeviceControlByWebBinding -import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.utils.LocaleConstant -import com.just.agentweb.AgentWeb -import com.just.agentweb.WebViewClient -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.widget.TitleBarView - -class DeviceControlByWebActivity : KotlinBaseActivity() { - - private lateinit var agentWeb: AgentWeb - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - ActivityStackManager.addActivity(this) - agentWeb = AgentWeb.with(this).setAgentWebParent( - binding.containerView, LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT - ) - ).useDefaultIndicator().setWebViewClient(object : WebViewClient() { - override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) { - - } - - override fun onPageFinished(view: WebView?, url: String?) { - - } - }).setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) - .interceptUnkownUrl() - .createAgentWeb() - .ready() - .go(LocaleConstant.DEVICE_CONTROL_URL) - val webView = agentWeb.webCreator.webView - webView.settings.useWideViewPort = true - webView.settings.builtInZoomControls = true - webView.settings.setSupportZoom(true) - webView.settings.displayZoomControls = false - webView.setInitialScale(4) - } - - override fun initViewBinding(): ActivityDeviceControlByWebBinding { - return ActivityDeviceControlByWebBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - - } - }) - } - - override fun onResume() { - super.onResume() - agentWeb.webLifeCycle.onResume() - } - - override fun onPause() { - agentWeb.webLifeCycle.onPause() - super.onPause() - } - - override fun onDestroy() { - agentWeb.webLifeCycle.onDestroy() - super.onDestroy() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 1e3078e..98d4ffe 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -329,7 +329,6 @@ } binding.fenceTextView.setOnClickListener { -// navigatePageTo() navigatePageTo() } diff --git a/app/src/main/res/layout/activity_apply_enter.xml b/app/src/main/res/layout/activity_apply_enter.xml index 63e7dfc..2ef2323 100644 --- a/app/src/main/res/layout/activity_apply_enter.xml +++ b/app/src/main/res/layout/activity_apply_enter.xml @@ -12,13 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/mainThemeColor" - app:tbv_left_image="@drawable/ic_title_left" - app:tbv_only_show_title="false" - app:tbv_show_left_image="true" - app:tbv_show_right_image="false" - app:tbv_text="人员信息" - app:tbv_text_color="@color/white" - app:tbv_text_size="@dimen/sp_18" /> + app:tbv_text="人员信息" /> + app:tbv_text="云台控制" /> - + android:value="e55914bf5235959106281ba7cf277897" /> diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index e2a34cf..4677940 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,8 +49,7 @@ ) } -// const val SERVER_BASE_URL = "http://192.168.9.99:8085" - const val SERVER_BASE_URL = "http://139.198.19.235:22006" + const val SERVER_BASE_URL = "http://111.198.10.15:22005" //一体机DeviceMonitor程序TCP Server IP地址 const val GAS_BASE_IP = "192.168.10.139" diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index 30fc847..440af43 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -204,7 +204,7 @@ regionViewModel.setVideoRegion("YTJ_010001", region) } - binding.leftButton.setOnTouchListener { _, event -> + binding.leftControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Left") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -212,7 +212,7 @@ false } - binding.topButton.setOnTouchListener { _, event -> + binding.topControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Up") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -220,7 +220,7 @@ false } - binding.rightButton.setOnTouchListener { _, event -> + binding.rightControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Right") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -228,7 +228,7 @@ false } - binding.bottomButton.setOnTouchListener { _, event -> + binding.bottomControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Down") MotionEvent.ACTION_UP -> executeCommand("Stop") diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt deleted file mode 100644 index 3026da3..0000000 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.br.operationsite.view - -import android.graphics.Bitmap -import android.os.Bundle -import android.view.ViewGroup -import android.webkit.WebView -import android.widget.LinearLayout -import com.casic.br.operationsite.R -import com.casic.br.operationsite.databinding.ActivityDeviceControlByWebBinding -import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.utils.LocaleConstant -import com.just.agentweb.AgentWeb -import com.just.agentweb.WebViewClient -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.widget.TitleBarView - -class DeviceControlByWebActivity : KotlinBaseActivity() { - - private lateinit var agentWeb: AgentWeb - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - ActivityStackManager.addActivity(this) - agentWeb = AgentWeb.with(this).setAgentWebParent( - binding.containerView, LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT - ) - ).useDefaultIndicator().setWebViewClient(object : WebViewClient() { - override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) { - - } - - override fun onPageFinished(view: WebView?, url: String?) { - - } - }).setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) - .interceptUnkownUrl() - .createAgentWeb() - .ready() - .go(LocaleConstant.DEVICE_CONTROL_URL) - val webView = agentWeb.webCreator.webView - webView.settings.useWideViewPort = true - webView.settings.builtInZoomControls = true - webView.settings.setSupportZoom(true) - webView.settings.displayZoomControls = false - webView.setInitialScale(4) - } - - override fun initViewBinding(): ActivityDeviceControlByWebBinding { - return ActivityDeviceControlByWebBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - - } - }) - } - - override fun onResume() { - super.onResume() - agentWeb.webLifeCycle.onResume() - } - - override fun onPause() { - agentWeb.webLifeCycle.onPause() - super.onPause() - } - - override fun onDestroy() { - agentWeb.webLifeCycle.onDestroy() - super.onDestroy() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 1e3078e..98d4ffe 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -329,7 +329,6 @@ } binding.fenceTextView.setOnClickListener { -// navigatePageTo() navigatePageTo() } diff --git a/app/src/main/res/layout/activity_apply_enter.xml b/app/src/main/res/layout/activity_apply_enter.xml index 63e7dfc..2ef2323 100644 --- a/app/src/main/res/layout/activity_apply_enter.xml +++ b/app/src/main/res/layout/activity_apply_enter.xml @@ -12,13 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/mainThemeColor" - app:tbv_left_image="@drawable/ic_title_left" - app:tbv_only_show_title="false" - app:tbv_show_left_image="true" - app:tbv_show_right_image="false" - app:tbv_text="人员信息" - app:tbv_text_color="@color/white" - app:tbv_text_size="@dimen/sp_18" /> + app:tbv_text="人员信息" /> + app:tbv_text="云台控制" /> - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 157c592..35da2a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9492397..4f8f4c1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,7 +69,6 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> - + android:value="e55914bf5235959106281ba7cf277897" /> diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index e2a34cf..4677940 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,8 +49,7 @@ ) } -// const val SERVER_BASE_URL = "http://192.168.9.99:8085" - const val SERVER_BASE_URL = "http://139.198.19.235:22006" + const val SERVER_BASE_URL = "http://111.198.10.15:22005" //一体机DeviceMonitor程序TCP Server IP地址 const val GAS_BASE_IP = "192.168.10.139" diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index 30fc847..440af43 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -204,7 +204,7 @@ regionViewModel.setVideoRegion("YTJ_010001", region) } - binding.leftButton.setOnTouchListener { _, event -> + binding.leftControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Left") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -212,7 +212,7 @@ false } - binding.topButton.setOnTouchListener { _, event -> + binding.topControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Up") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -220,7 +220,7 @@ false } - binding.rightButton.setOnTouchListener { _, event -> + binding.rightControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Right") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -228,7 +228,7 @@ false } - binding.bottomButton.setOnTouchListener { _, event -> + binding.bottomControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Down") MotionEvent.ACTION_UP -> executeCommand("Stop") diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt deleted file mode 100644 index 3026da3..0000000 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.br.operationsite.view - -import android.graphics.Bitmap -import android.os.Bundle -import android.view.ViewGroup -import android.webkit.WebView -import android.widget.LinearLayout -import com.casic.br.operationsite.R -import com.casic.br.operationsite.databinding.ActivityDeviceControlByWebBinding -import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.utils.LocaleConstant -import com.just.agentweb.AgentWeb -import com.just.agentweb.WebViewClient -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.widget.TitleBarView - -class DeviceControlByWebActivity : KotlinBaseActivity() { - - private lateinit var agentWeb: AgentWeb - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - ActivityStackManager.addActivity(this) - agentWeb = AgentWeb.with(this).setAgentWebParent( - binding.containerView, LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT - ) - ).useDefaultIndicator().setWebViewClient(object : WebViewClient() { - override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) { - - } - - override fun onPageFinished(view: WebView?, url: String?) { - - } - }).setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) - .interceptUnkownUrl() - .createAgentWeb() - .ready() - .go(LocaleConstant.DEVICE_CONTROL_URL) - val webView = agentWeb.webCreator.webView - webView.settings.useWideViewPort = true - webView.settings.builtInZoomControls = true - webView.settings.setSupportZoom(true) - webView.settings.displayZoomControls = false - webView.setInitialScale(4) - } - - override fun initViewBinding(): ActivityDeviceControlByWebBinding { - return ActivityDeviceControlByWebBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - - } - }) - } - - override fun onResume() { - super.onResume() - agentWeb.webLifeCycle.onResume() - } - - override fun onPause() { - agentWeb.webLifeCycle.onPause() - super.onPause() - } - - override fun onDestroy() { - agentWeb.webLifeCycle.onDestroy() - super.onDestroy() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 1e3078e..98d4ffe 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -329,7 +329,6 @@ } binding.fenceTextView.setOnClickListener { -// navigatePageTo() navigatePageTo() } diff --git a/app/src/main/res/layout/activity_apply_enter.xml b/app/src/main/res/layout/activity_apply_enter.xml index 63e7dfc..2ef2323 100644 --- a/app/src/main/res/layout/activity_apply_enter.xml +++ b/app/src/main/res/layout/activity_apply_enter.xml @@ -12,13 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/mainThemeColor" - app:tbv_left_image="@drawable/ic_title_left" - app:tbv_only_show_title="false" - app:tbv_show_left_image="true" - app:tbv_show_right_image="false" - app:tbv_text="人员信息" - app:tbv_text_color="@color/white" - app:tbv_text_size="@dimen/sp_18" /> + app:tbv_text="人员信息" /> + app:tbv_text="云台控制" /> - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_face_detect.xml b/app/src/main/res/layout/activity_face_detect.xml index 1aca4b1..1204387 100644 --- a/app/src/main/res/layout/activity_face_detect.xml +++ b/app/src/main/res/layout/activity_face_detect.xml @@ -11,13 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/mainThemeColor" - app:tbv_left_image="@drawable/ic_title_left" - app:tbv_only_show_title="false" - app:tbv_show_left_image="true" - app:tbv_show_right_image="false" - app:tbv_text="入场申请人脸采集" - app:tbv_text_color="@color/white" - app:tbv_text_size="@dimen/sp_18" /> + app:tbv_text="入场申请人脸采集" /> - + android:value="e55914bf5235959106281ba7cf277897" /> diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index e2a34cf..4677940 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,8 +49,7 @@ ) } -// const val SERVER_BASE_URL = "http://192.168.9.99:8085" - const val SERVER_BASE_URL = "http://139.198.19.235:22006" + const val SERVER_BASE_URL = "http://111.198.10.15:22005" //一体机DeviceMonitor程序TCP Server IP地址 const val GAS_BASE_IP = "192.168.10.139" diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index 30fc847..440af43 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -204,7 +204,7 @@ regionViewModel.setVideoRegion("YTJ_010001", region) } - binding.leftButton.setOnTouchListener { _, event -> + binding.leftControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Left") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -212,7 +212,7 @@ false } - binding.topButton.setOnTouchListener { _, event -> + binding.topControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Up") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -220,7 +220,7 @@ false } - binding.rightButton.setOnTouchListener { _, event -> + binding.rightControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Right") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -228,7 +228,7 @@ false } - binding.bottomButton.setOnTouchListener { _, event -> + binding.bottomControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Down") MotionEvent.ACTION_UP -> executeCommand("Stop") diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt deleted file mode 100644 index 3026da3..0000000 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.br.operationsite.view - -import android.graphics.Bitmap -import android.os.Bundle -import android.view.ViewGroup -import android.webkit.WebView -import android.widget.LinearLayout -import com.casic.br.operationsite.R -import com.casic.br.operationsite.databinding.ActivityDeviceControlByWebBinding -import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.utils.LocaleConstant -import com.just.agentweb.AgentWeb -import com.just.agentweb.WebViewClient -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.widget.TitleBarView - -class DeviceControlByWebActivity : KotlinBaseActivity() { - - private lateinit var agentWeb: AgentWeb - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - ActivityStackManager.addActivity(this) - agentWeb = AgentWeb.with(this).setAgentWebParent( - binding.containerView, LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT - ) - ).useDefaultIndicator().setWebViewClient(object : WebViewClient() { - override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) { - - } - - override fun onPageFinished(view: WebView?, url: String?) { - - } - }).setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) - .interceptUnkownUrl() - .createAgentWeb() - .ready() - .go(LocaleConstant.DEVICE_CONTROL_URL) - val webView = agentWeb.webCreator.webView - webView.settings.useWideViewPort = true - webView.settings.builtInZoomControls = true - webView.settings.setSupportZoom(true) - webView.settings.displayZoomControls = false - webView.setInitialScale(4) - } - - override fun initViewBinding(): ActivityDeviceControlByWebBinding { - return ActivityDeviceControlByWebBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - - } - }) - } - - override fun onResume() { - super.onResume() - agentWeb.webLifeCycle.onResume() - } - - override fun onPause() { - agentWeb.webLifeCycle.onPause() - super.onPause() - } - - override fun onDestroy() { - agentWeb.webLifeCycle.onDestroy() - super.onDestroy() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 1e3078e..98d4ffe 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -329,7 +329,6 @@ } binding.fenceTextView.setOnClickListener { -// navigatePageTo() navigatePageTo() } diff --git a/app/src/main/res/layout/activity_apply_enter.xml b/app/src/main/res/layout/activity_apply_enter.xml index 63e7dfc..2ef2323 100644 --- a/app/src/main/res/layout/activity_apply_enter.xml +++ b/app/src/main/res/layout/activity_apply_enter.xml @@ -12,13 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/mainThemeColor" - app:tbv_left_image="@drawable/ic_title_left" - app:tbv_only_show_title="false" - app:tbv_show_left_image="true" - app:tbv_show_right_image="false" - app:tbv_text="人员信息" - app:tbv_text_color="@color/white" - app:tbv_text_size="@dimen/sp_18" /> + app:tbv_text="人员信息" /> + app:tbv_text="云台控制" /> - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_face_detect.xml b/app/src/main/res/layout/activity_face_detect.xml index 1aca4b1..1204387 100644 --- a/app/src/main/res/layout/activity_face_detect.xml +++ b/app/src/main/res/layout/activity_face_detect.xml @@ -11,13 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/mainThemeColor" - app:tbv_left_image="@drawable/ic_title_left" - app:tbv_only_show_title="false" - app:tbv_show_left_image="true" - app:tbv_show_right_image="false" - app:tbv_text="入场申请人脸采集" - app:tbv_text_color="@color/white" - app:tbv_text_size="@dimen/sp_18" /> + app:tbv_text="入场申请人脸采集" /> + app:tbv_text="视频通话" /> - + android:value="e55914bf5235959106281ba7cf277897" /> diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index e2a34cf..4677940 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,8 +49,7 @@ ) } -// const val SERVER_BASE_URL = "http://192.168.9.99:8085" - const val SERVER_BASE_URL = "http://139.198.19.235:22006" + const val SERVER_BASE_URL = "http://111.198.10.15:22005" //一体机DeviceMonitor程序TCP Server IP地址 const val GAS_BASE_IP = "192.168.10.139" diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index 30fc847..440af43 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -204,7 +204,7 @@ regionViewModel.setVideoRegion("YTJ_010001", region) } - binding.leftButton.setOnTouchListener { _, event -> + binding.leftControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Left") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -212,7 +212,7 @@ false } - binding.topButton.setOnTouchListener { _, event -> + binding.topControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Up") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -220,7 +220,7 @@ false } - binding.rightButton.setOnTouchListener { _, event -> + binding.rightControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Right") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -228,7 +228,7 @@ false } - binding.bottomButton.setOnTouchListener { _, event -> + binding.bottomControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Down") MotionEvent.ACTION_UP -> executeCommand("Stop") diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt deleted file mode 100644 index 3026da3..0000000 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.br.operationsite.view - -import android.graphics.Bitmap -import android.os.Bundle -import android.view.ViewGroup -import android.webkit.WebView -import android.widget.LinearLayout -import com.casic.br.operationsite.R -import com.casic.br.operationsite.databinding.ActivityDeviceControlByWebBinding -import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.utils.LocaleConstant -import com.just.agentweb.AgentWeb -import com.just.agentweb.WebViewClient -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.widget.TitleBarView - -class DeviceControlByWebActivity : KotlinBaseActivity() { - - private lateinit var agentWeb: AgentWeb - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - ActivityStackManager.addActivity(this) - agentWeb = AgentWeb.with(this).setAgentWebParent( - binding.containerView, LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT - ) - ).useDefaultIndicator().setWebViewClient(object : WebViewClient() { - override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) { - - } - - override fun onPageFinished(view: WebView?, url: String?) { - - } - }).setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) - .interceptUnkownUrl() - .createAgentWeb() - .ready() - .go(LocaleConstant.DEVICE_CONTROL_URL) - val webView = agentWeb.webCreator.webView - webView.settings.useWideViewPort = true - webView.settings.builtInZoomControls = true - webView.settings.setSupportZoom(true) - webView.settings.displayZoomControls = false - webView.setInitialScale(4) - } - - override fun initViewBinding(): ActivityDeviceControlByWebBinding { - return ActivityDeviceControlByWebBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - - } - }) - } - - override fun onResume() { - super.onResume() - agentWeb.webLifeCycle.onResume() - } - - override fun onPause() { - agentWeb.webLifeCycle.onPause() - super.onPause() - } - - override fun onDestroy() { - agentWeb.webLifeCycle.onDestroy() - super.onDestroy() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 1e3078e..98d4ffe 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -329,7 +329,6 @@ } binding.fenceTextView.setOnClickListener { -// navigatePageTo() navigatePageTo() } diff --git a/app/src/main/res/layout/activity_apply_enter.xml b/app/src/main/res/layout/activity_apply_enter.xml index 63e7dfc..2ef2323 100644 --- a/app/src/main/res/layout/activity_apply_enter.xml +++ b/app/src/main/res/layout/activity_apply_enter.xml @@ -12,13 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/mainThemeColor" - app:tbv_left_image="@drawable/ic_title_left" - app:tbv_only_show_title="false" - app:tbv_show_left_image="true" - app:tbv_show_right_image="false" - app:tbv_text="人员信息" - app:tbv_text_color="@color/white" - app:tbv_text_size="@dimen/sp_18" /> + app:tbv_text="人员信息" /> + app:tbv_text="云台控制" /> - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_face_detect.xml b/app/src/main/res/layout/activity_face_detect.xml index 1aca4b1..1204387 100644 --- a/app/src/main/res/layout/activity_face_detect.xml +++ b/app/src/main/res/layout/activity_face_detect.xml @@ -11,13 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/mainThemeColor" - app:tbv_left_image="@drawable/ic_title_left" - app:tbv_only_show_title="false" - app:tbv_show_left_image="true" - app:tbv_show_right_image="false" - app:tbv_text="入场申请人脸采集" - app:tbv_text_color="@color/white" - app:tbv_text_size="@dimen/sp_18" /> + app:tbv_text="入场申请人脸采集" /> + app:tbv_text="视频通话" /> + app:tbv_text="燃气作业现场动态感知" /> - + android:value="e55914bf5235959106281ba7cf277897" /> diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index e2a34cf..4677940 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,8 +49,7 @@ ) } -// const val SERVER_BASE_URL = "http://192.168.9.99:8085" - const val SERVER_BASE_URL = "http://139.198.19.235:22006" + const val SERVER_BASE_URL = "http://111.198.10.15:22005" //一体机DeviceMonitor程序TCP Server IP地址 const val GAS_BASE_IP = "192.168.10.139" diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index 30fc847..440af43 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -204,7 +204,7 @@ regionViewModel.setVideoRegion("YTJ_010001", region) } - binding.leftButton.setOnTouchListener { _, event -> + binding.leftControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Left") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -212,7 +212,7 @@ false } - binding.topButton.setOnTouchListener { _, event -> + binding.topControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Up") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -220,7 +220,7 @@ false } - binding.rightButton.setOnTouchListener { _, event -> + binding.rightControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Right") MotionEvent.ACTION_UP -> executeCommand("Stop") @@ -228,7 +228,7 @@ false } - binding.bottomButton.setOnTouchListener { _, event -> + binding.bottomControlButton.setOnTouchListener { _, event -> when (event.action) { MotionEvent.ACTION_DOWN -> executeCommand("Down") MotionEvent.ACTION_UP -> executeCommand("Stop") diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt deleted file mode 100644 index 3026da3..0000000 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt +++ /dev/null @@ -1,88 +0,0 @@ -package com.casic.br.operationsite.view - -import android.graphics.Bitmap -import android.os.Bundle -import android.view.ViewGroup -import android.webkit.WebView -import android.widget.LinearLayout -import com.casic.br.operationsite.R -import com.casic.br.operationsite.databinding.ActivityDeviceControlByWebBinding -import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.utils.LocaleConstant -import com.just.agentweb.AgentWeb -import com.just.agentweb.WebViewClient -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.widget.TitleBarView - -class DeviceControlByWebActivity : KotlinBaseActivity() { - - private lateinit var agentWeb: AgentWeb - - override fun initEvent() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - ActivityStackManager.addActivity(this) - agentWeb = AgentWeb.with(this).setAgentWebParent( - binding.containerView, LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT - ) - ).useDefaultIndicator().setWebViewClient(object : WebViewClient() { - override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) { - - } - - override fun onPageFinished(view: WebView?, url: String?) { - - } - }).setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) - .interceptUnkownUrl() - .createAgentWeb() - .ready() - .go(LocaleConstant.DEVICE_CONTROL_URL) - val webView = agentWeb.webCreator.webView - webView.settings.useWideViewPort = true - webView.settings.builtInZoomControls = true - webView.settings.setSupportZoom(true) - webView.settings.displayZoomControls = false - webView.setInitialScale(4) - } - - override fun initViewBinding(): ActivityDeviceControlByWebBinding { - return ActivityDeviceControlByWebBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - - } - }) - } - - override fun onResume() { - super.onResume() - agentWeb.webLifeCycle.onResume() - } - - override fun onPause() { - agentWeb.webLifeCycle.onPause() - super.onPause() - } - - override fun onDestroy() { - agentWeb.webLifeCycle.onDestroy() - super.onDestroy() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 1e3078e..98d4ffe 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -329,7 +329,6 @@ } binding.fenceTextView.setOnClickListener { -// navigatePageTo() navigatePageTo() } diff --git a/app/src/main/res/layout/activity_apply_enter.xml b/app/src/main/res/layout/activity_apply_enter.xml index 63e7dfc..2ef2323 100644 --- a/app/src/main/res/layout/activity_apply_enter.xml +++ b/app/src/main/res/layout/activity_apply_enter.xml @@ -12,13 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/mainThemeColor" - app:tbv_left_image="@drawable/ic_title_left" - app:tbv_only_show_title="false" - app:tbv_show_left_image="true" - app:tbv_show_right_image="false" - app:tbv_text="人员信息" - app:tbv_text_color="@color/white" - app:tbv_text_size="@dimen/sp_18" /> + app:tbv_text="人员信息" /> + app:tbv_text="云台控制" /> - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_face_detect.xml b/app/src/main/res/layout/activity_face_detect.xml index 1aca4b1..1204387 100644 --- a/app/src/main/res/layout/activity_face_detect.xml +++ b/app/src/main/res/layout/activity_face_detect.xml @@ -11,13 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/mainThemeColor" - app:tbv_left_image="@drawable/ic_title_left" - app:tbv_only_show_title="false" - app:tbv_show_left_image="true" - app:tbv_show_right_image="false" - app:tbv_text="入场申请人脸采集" - app:tbv_text_color="@color/white" - app:tbv_text_size="@dimen/sp_18" /> + app:tbv_text="入场申请人脸采集" /> + app:tbv_text="视频通话" /> + app:tbv_text="燃气作业现场动态感知" /> + app:tbv_text="事件信息" />