diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 16eb52b..8ee6726 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -70,7 +70,9 @@ android:theme="@style/Theme.CustomActivityAnimation" /> - + - + { if (this.isBlank()) { return Pair(404, "Invalid Response") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 16eb52b..8ee6726 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -70,7 +70,9 @@ android:theme="@style/Theme.CustomActivityAnimation" /> - + { if (this.isBlank()) { return Pair(404, "Invalid Response") diff --git a/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt b/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt index abb5444..c826e89 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt @@ -2,5 +2,4 @@ object RuntimeCache { var projectId = "" - var userHelmetCode = "" } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 16eb52b..8ee6726 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -70,7 +70,9 @@ android:theme="@style/Theme.CustomActivityAnimation" /> - + { if (this.isBlank()) { return Pair(404, "Invalid Response") diff --git a/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt b/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt index abb5444..c826e89 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt @@ -2,5 +2,4 @@ object RuntimeCache { var projectId = "" - var userHelmetCode = "" } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/HelmetVideoActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HelmetVideoActivity.kt index 69e34d0..ee52ca7 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HelmetVideoActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HelmetVideoActivity.kt @@ -1,23 +1,21 @@ package com.casic.br.operationsite.view -import android.content.Intent import android.graphics.Bitmap import android.os.Bundle import android.view.ViewGroup import android.webkit.PermissionRequest import android.webkit.WebView import android.widget.LinearLayout -import com.casic.br.operationsite.R +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsCompat import com.casic.br.operationsite.databinding.ActivityHelmetVideoBinding -import com.casic.br.operationsite.extensions.initImmersionBar import com.casic.br.operationsite.utils.LocaleConstant -import com.casic.br.operationsite.utils.RuntimeCache import com.just.agentweb.AgentWeb import com.just.agentweb.WebChromeClient 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 +import com.pengxh.kt.lite.utils.LiteKitConstant class HelmetVideoActivity : KotlinBaseActivity() { @@ -30,9 +28,15 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) + val insetsController = WindowCompat.getInsetsController(window, binding.rootView) + insetsController.hide(WindowInsetsCompat.Type.statusBars()) + insetsController.hide(WindowInsetsCompat.Type.navigationBars()) + + val helmetCode = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY) + agentWeb = AgentWeb.with(this) .setAgentWebParent( - binding.containerView, LinearLayout.LayoutParams( + binding.rootView, LinearLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT ) ) @@ -56,8 +60,7 @@ .createAgentWeb() .ready() .go( - "https://jls.huaweisoft.com/#/realvideo?" + - "id=${RuntimeCache.userHelmetCode}&" + + "https://jls.huaweisoft.com/#/realvideo?id=$helmetCode&" + "appKey=${LocaleConstant.HELMET_VIDEO_APP_KEY}&" + "secretKey=${LocaleConstant.HELMET_VIDEO_SECRET_KEY}" ) @@ -78,18 +81,7 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - val intent = Intent() - setResult(RESULT_OK, intent) - finish() - } - override fun onRightClick() { - - } - }) } override fun onResume() { @@ -98,12 +90,12 @@ } override fun onPause() { - agentWeb.webLifeCycle.onPause() super.onPause() + agentWeb.webLifeCycle.onPause() } override fun onDestroy() { - agentWeb.webLifeCycle.onDestroy() super.onDestroy() + agentWeb.webLifeCycle.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 16eb52b..8ee6726 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -70,7 +70,9 @@ android:theme="@style/Theme.CustomActivityAnimation" /> - + { if (this.isBlank()) { return Pair(404, "Invalid Response") diff --git a/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt b/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt index abb5444..c826e89 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt @@ -2,5 +2,4 @@ object RuntimeCache { var projectId = "" - var userHelmetCode = "" } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/HelmetVideoActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HelmetVideoActivity.kt index 69e34d0..ee52ca7 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HelmetVideoActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HelmetVideoActivity.kt @@ -1,23 +1,21 @@ package com.casic.br.operationsite.view -import android.content.Intent import android.graphics.Bitmap import android.os.Bundle import android.view.ViewGroup import android.webkit.PermissionRequest import android.webkit.WebView import android.widget.LinearLayout -import com.casic.br.operationsite.R +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsCompat import com.casic.br.operationsite.databinding.ActivityHelmetVideoBinding -import com.casic.br.operationsite.extensions.initImmersionBar import com.casic.br.operationsite.utils.LocaleConstant -import com.casic.br.operationsite.utils.RuntimeCache import com.just.agentweb.AgentWeb import com.just.agentweb.WebChromeClient 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 +import com.pengxh.kt.lite.utils.LiteKitConstant class HelmetVideoActivity : KotlinBaseActivity() { @@ -30,9 +28,15 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) + val insetsController = WindowCompat.getInsetsController(window, binding.rootView) + insetsController.hide(WindowInsetsCompat.Type.statusBars()) + insetsController.hide(WindowInsetsCompat.Type.navigationBars()) + + val helmetCode = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY) + agentWeb = AgentWeb.with(this) .setAgentWebParent( - binding.containerView, LinearLayout.LayoutParams( + binding.rootView, LinearLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT ) ) @@ -56,8 +60,7 @@ .createAgentWeb() .ready() .go( - "https://jls.huaweisoft.com/#/realvideo?" + - "id=${RuntimeCache.userHelmetCode}&" + + "https://jls.huaweisoft.com/#/realvideo?id=$helmetCode&" + "appKey=${LocaleConstant.HELMET_VIDEO_APP_KEY}&" + "secretKey=${LocaleConstant.HELMET_VIDEO_SECRET_KEY}" ) @@ -78,18 +81,7 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - val intent = Intent() - setResult(RESULT_OK, intent) - finish() - } - override fun onRightClick() { - - } - }) } override fun onResume() { @@ -98,12 +90,12 @@ } override fun onPause() { - agentWeb.webLifeCycle.onPause() super.onPause() + agentWeb.webLifeCycle.onPause() } override fun onDestroy() { - agentWeb.webLifeCycle.onDestroy() super.onDestroy() + agentWeb.webLifeCycle.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_helmet_video.xml b/app/src/main/res/layout/activity_helmet_video.xml index bfbc81d..9d64c5c 100644 --- a/app/src/main/res/layout/activity_helmet_video.xml +++ b/app/src/main/res/layout/activity_helmet_video.xml @@ -1,29 +1,7 @@ - - - - - - - \ No newline at end of file + android:orientation="vertical" /> \ No newline at end of file