diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 362cb59..4bee546 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -75,7 +75,8 @@
android:name=".view.BigImageActivity"
android:theme="@style/Theme.BigImageActivity" />
-
+
+
-
+
+
() {
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ ActivityStackManager.addActivity(this)
+
+ //动态设置rtspPlayerView宽高
+ val params = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams
+ val videoWidth = getScreenWidth()
+ val videoHeight = videoWidth * (9f / 16)
+ params.width = videoWidth
+ params.height = videoHeight.toInt()
+ binding.rtspPlayerView.layoutParams = params
+ VideoPlayerManager.setGSYVideoPlayerOptions(binding.rtspPlayerView, LocaleConstant.SUB_RTSP_URL)
+ }
+
+ override fun initViewBinding(): ActivityDeviceControlByNativeBinding {
+ return ActivityDeviceControlByNativeBinding.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() {
+
+ }
+ })
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 362cb59..4bee546 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -75,7 +75,8 @@
android:name=".view.BigImageActivity"
android:theme="@style/Theme.BigImageActivity" />
-
+
+
() {
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ ActivityStackManager.addActivity(this)
+
+ //动态设置rtspPlayerView宽高
+ val params = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams
+ val videoWidth = getScreenWidth()
+ val videoHeight = videoWidth * (9f / 16)
+ params.width = videoWidth
+ params.height = videoHeight.toInt()
+ binding.rtspPlayerView.layoutParams = params
+ VideoPlayerManager.setGSYVideoPlayerOptions(binding.rtspPlayerView, LocaleConstant.SUB_RTSP_URL)
+ }
+
+ override fun initViewBinding(): ActivityDeviceControlByNativeBinding {
+ return ActivityDeviceControlByNativeBinding.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() {
+
+ }
+ })
+ }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..59ebef1
--- /dev/null
+++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt
@@ -0,0 +1,88 @@
+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_CONTROLLER_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/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 362cb59..4bee546 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -75,7 +75,8 @@
android:name=".view.BigImageActivity"
android:theme="@style/Theme.BigImageActivity" />
-
+
+
() {
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ ActivityStackManager.addActivity(this)
+
+ //动态设置rtspPlayerView宽高
+ val params = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams
+ val videoWidth = getScreenWidth()
+ val videoHeight = videoWidth * (9f / 16)
+ params.width = videoWidth
+ params.height = videoHeight.toInt()
+ binding.rtspPlayerView.layoutParams = params
+ VideoPlayerManager.setGSYVideoPlayerOptions(binding.rtspPlayerView, LocaleConstant.SUB_RTSP_URL)
+ }
+
+ override fun initViewBinding(): ActivityDeviceControlByNativeBinding {
+ return ActivityDeviceControlByNativeBinding.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() {
+
+ }
+ })
+ }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..59ebef1
--- /dev/null
+++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt
@@ -0,0 +1,88 @@
+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_CONTROLLER_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/DeviceControllerActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControllerActivity.kt
deleted file mode 100644
index 5dd220e..0000000
--- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControllerActivity.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.ActivityDeviceControllerBinding
-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 DeviceControllerActivity : 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_CONTROLLER_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(): ActivityDeviceControllerBinding {
- return ActivityDeviceControllerBinding.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/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 362cb59..4bee546 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -75,7 +75,8 @@
android:name=".view.BigImageActivity"
android:theme="@style/Theme.BigImageActivity" />
-
+
+
() {
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ ActivityStackManager.addActivity(this)
+
+ //动态设置rtspPlayerView宽高
+ val params = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams
+ val videoWidth = getScreenWidth()
+ val videoHeight = videoWidth * (9f / 16)
+ params.width = videoWidth
+ params.height = videoHeight.toInt()
+ binding.rtspPlayerView.layoutParams = params
+ VideoPlayerManager.setGSYVideoPlayerOptions(binding.rtspPlayerView, LocaleConstant.SUB_RTSP_URL)
+ }
+
+ override fun initViewBinding(): ActivityDeviceControlByNativeBinding {
+ return ActivityDeviceControlByNativeBinding.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() {
+
+ }
+ })
+ }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..59ebef1
--- /dev/null
+++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt
@@ -0,0 +1,88 @@
+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_CONTROLLER_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/DeviceControllerActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControllerActivity.kt
deleted file mode 100644
index 5dd220e..0000000
--- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControllerActivity.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.ActivityDeviceControllerBinding
-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 DeviceControllerActivity : 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_CONTROLLER_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(): ActivityDeviceControllerBinding {
- return ActivityDeviceControllerBinding.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 44bc974..a8a44b5 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
@@ -365,7 +365,8 @@
}
binding.fenceTextView.setOnClickListener {
- navigatePageTo()
+// navigatePageTo()
+ navigatePageTo()
}
binding.uploadTextView.setOnClickListener {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 362cb59..4bee546 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -75,7 +75,8 @@
android:name=".view.BigImageActivity"
android:theme="@style/Theme.BigImageActivity" />
-
+
+
() {
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ ActivityStackManager.addActivity(this)
+
+ //动态设置rtspPlayerView宽高
+ val params = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams
+ val videoWidth = getScreenWidth()
+ val videoHeight = videoWidth * (9f / 16)
+ params.width = videoWidth
+ params.height = videoHeight.toInt()
+ binding.rtspPlayerView.layoutParams = params
+ VideoPlayerManager.setGSYVideoPlayerOptions(binding.rtspPlayerView, LocaleConstant.SUB_RTSP_URL)
+ }
+
+ override fun initViewBinding(): ActivityDeviceControlByNativeBinding {
+ return ActivityDeviceControlByNativeBinding.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() {
+
+ }
+ })
+ }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..59ebef1
--- /dev/null
+++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt
@@ -0,0 +1,88 @@
+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_CONTROLLER_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/DeviceControllerActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControllerActivity.kt
deleted file mode 100644
index 5dd220e..0000000
--- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControllerActivity.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.ActivityDeviceControllerBinding
-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 DeviceControllerActivity : 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_CONTROLLER_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(): ActivityDeviceControllerBinding {
- return ActivityDeviceControllerBinding.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 44bc974..a8a44b5 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
@@ -365,7 +365,8 @@
}
binding.fenceTextView.setOnClickListener {
- navigatePageTo()
+// navigatePageTo()
+ navigatePageTo()
}
binding.uploadTextView.setOnClickListener {
diff --git a/app/src/main/res/layout/activity_device_control_by_native.xml b/app/src/main/res/layout/activity_device_control_by_native.xml
new file mode 100644
index 0000000..f7862c3
--- /dev/null
+++ b/app/src/main/res/layout/activity_device_control_by_native.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 362cb59..4bee546 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -75,7 +75,8 @@
android:name=".view.BigImageActivity"
android:theme="@style/Theme.BigImageActivity" />
-
+
+
() {
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ ActivityStackManager.addActivity(this)
+
+ //动态设置rtspPlayerView宽高
+ val params = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams
+ val videoWidth = getScreenWidth()
+ val videoHeight = videoWidth * (9f / 16)
+ params.width = videoWidth
+ params.height = videoHeight.toInt()
+ binding.rtspPlayerView.layoutParams = params
+ VideoPlayerManager.setGSYVideoPlayerOptions(binding.rtspPlayerView, LocaleConstant.SUB_RTSP_URL)
+ }
+
+ override fun initViewBinding(): ActivityDeviceControlByNativeBinding {
+ return ActivityDeviceControlByNativeBinding.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() {
+
+ }
+ })
+ }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..59ebef1
--- /dev/null
+++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt
@@ -0,0 +1,88 @@
+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_CONTROLLER_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/DeviceControllerActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControllerActivity.kt
deleted file mode 100644
index 5dd220e..0000000
--- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControllerActivity.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.ActivityDeviceControllerBinding
-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 DeviceControllerActivity : 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_CONTROLLER_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(): ActivityDeviceControllerBinding {
- return ActivityDeviceControllerBinding.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 44bc974..a8a44b5 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
@@ -365,7 +365,8 @@
}
binding.fenceTextView.setOnClickListener {
- navigatePageTo()
+// navigatePageTo()
+ navigatePageTo()
}
binding.uploadTextView.setOnClickListener {
diff --git a/app/src/main/res/layout/activity_device_control_by_native.xml b/app/src/main/res/layout/activity_device_control_by_native.xml
new file mode 100644
index 0000000..f7862c3
--- /dev/null
+++ b/app/src/main/res/layout/activity_device_control_by_native.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_device_control_by_web.xml b/app/src/main/res/layout/activity_device_control_by_web.xml
new file mode 100644
index 0000000..c5db367
--- /dev/null
+++ b/app/src/main/res/layout/activity_device_control_by_web.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 362cb59..4bee546 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -75,7 +75,8 @@
android:name=".view.BigImageActivity"
android:theme="@style/Theme.BigImageActivity" />
-
+
+
() {
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ ActivityStackManager.addActivity(this)
+
+ //动态设置rtspPlayerView宽高
+ val params = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams
+ val videoWidth = getScreenWidth()
+ val videoHeight = videoWidth * (9f / 16)
+ params.width = videoWidth
+ params.height = videoHeight.toInt()
+ binding.rtspPlayerView.layoutParams = params
+ VideoPlayerManager.setGSYVideoPlayerOptions(binding.rtspPlayerView, LocaleConstant.SUB_RTSP_URL)
+ }
+
+ override fun initViewBinding(): ActivityDeviceControlByNativeBinding {
+ return ActivityDeviceControlByNativeBinding.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() {
+
+ }
+ })
+ }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..59ebef1
--- /dev/null
+++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt
@@ -0,0 +1,88 @@
+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_CONTROLLER_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/DeviceControllerActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControllerActivity.kt
deleted file mode 100644
index 5dd220e..0000000
--- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControllerActivity.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.ActivityDeviceControllerBinding
-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 DeviceControllerActivity : 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_CONTROLLER_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(): ActivityDeviceControllerBinding {
- return ActivityDeviceControllerBinding.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 44bc974..a8a44b5 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
@@ -365,7 +365,8 @@
}
binding.fenceTextView.setOnClickListener {
- navigatePageTo()
+// navigatePageTo()
+ navigatePageTo()
}
binding.uploadTextView.setOnClickListener {
diff --git a/app/src/main/res/layout/activity_device_control_by_native.xml b/app/src/main/res/layout/activity_device_control_by_native.xml
new file mode 100644
index 0000000..f7862c3
--- /dev/null
+++ b/app/src/main/res/layout/activity_device_control_by_native.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_device_control_by_web.xml b/app/src/main/res/layout/activity_device_control_by_web.xml
new file mode 100644
index 0000000..c5db367
--- /dev/null
+++ b/app/src/main/res/layout/activity_device_control_by_web.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_device_controller.xml b/app/src/main/res/layout/activity_device_controller.xml
deleted file mode 100644
index c5db367..0000000
--- a/app/src/main/res/layout/activity_device_controller.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 362cb59..4bee546 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -75,7 +75,8 @@
android:name=".view.BigImageActivity"
android:theme="@style/Theme.BigImageActivity" />
-
+
+
() {
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ ActivityStackManager.addActivity(this)
+
+ //动态设置rtspPlayerView宽高
+ val params = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams
+ val videoWidth = getScreenWidth()
+ val videoHeight = videoWidth * (9f / 16)
+ params.width = videoWidth
+ params.height = videoHeight.toInt()
+ binding.rtspPlayerView.layoutParams = params
+ VideoPlayerManager.setGSYVideoPlayerOptions(binding.rtspPlayerView, LocaleConstant.SUB_RTSP_URL)
+ }
+
+ override fun initViewBinding(): ActivityDeviceControlByNativeBinding {
+ return ActivityDeviceControlByNativeBinding.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() {
+
+ }
+ })
+ }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..59ebef1
--- /dev/null
+++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByWebActivity.kt
@@ -0,0 +1,88 @@
+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_CONTROLLER_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/DeviceControllerActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControllerActivity.kt
deleted file mode 100644
index 5dd220e..0000000
--- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControllerActivity.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.ActivityDeviceControllerBinding
-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 DeviceControllerActivity : 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_CONTROLLER_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(): ActivityDeviceControllerBinding {
- return ActivityDeviceControllerBinding.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 44bc974..a8a44b5 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
@@ -365,7 +365,8 @@
}
binding.fenceTextView.setOnClickListener {
- navigatePageTo()
+// navigatePageTo()
+ navigatePageTo()
}
binding.uploadTextView.setOnClickListener {
diff --git a/app/src/main/res/layout/activity_device_control_by_native.xml b/app/src/main/res/layout/activity_device_control_by_native.xml
new file mode 100644
index 0000000..f7862c3
--- /dev/null
+++ b/app/src/main/res/layout/activity_device_control_by_native.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_device_control_by_web.xml b/app/src/main/res/layout/activity_device_control_by_web.xml
new file mode 100644
index 0000000..c5db367
--- /dev/null
+++ b/app/src/main/res/layout/activity_device_control_by_web.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_device_controller.xml b/app/src/main/res/layout/activity_device_controller.xml
deleted file mode 100644
index c5db367..0000000
--- a/app/src/main/res/layout/activity_device_controller.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b2aaec3..e4ca4ae 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -20,6 +20,7 @@
40dp
50dp
60dp
+ 65dp
75dp