diff --git a/app/build.gradle b/app/build.gradle index 86f828d..83f9dbf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,15 @@ targetSdkVersion 33 versionCode 1030 versionName "1.0.3.0" +// flavorDimensions "versionCode" } +// productFlavors { +// br { +// applicationId "com.casic.br.operationsite.test" +// } +// } + buildTypes { release { minifyEnabled false diff --git a/app/build.gradle b/app/build.gradle index 86f828d..83f9dbf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,15 @@ targetSdkVersion 33 versionCode 1030 versionName "1.0.3.0" +// flavorDimensions "versionCode" } +// productFlavors { +// br { +// applicationId "com.casic.br.operationsite.test" +// } +// } + buildTypes { release { minifyEnabled false 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 2d9719d..4806333 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 @@ -5,4 +5,5 @@ object RuntimeCache { val deviceModels = ArrayList() var projectId = "" + var userHelmetCode = "" } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 86f828d..83f9dbf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,15 @@ targetSdkVersion 33 versionCode 1030 versionName "1.0.3.0" +// flavorDimensions "versionCode" } +// productFlavors { +// br { +// applicationId "com.casic.br.operationsite.test" +// } +// } + buildTypes { release { minifyEnabled false 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 2d9719d..4806333 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 @@ -5,4 +5,5 @@ object RuntimeCache { val deviceModels = ArrayList() 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 aeaea64..69e34d0 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 @@ -11,12 +11,12 @@ 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.utils.Constant import com.pengxh.kt.lite.widget.TitleBarView class HelmetVideoActivity : KotlinBaseActivity() { @@ -30,8 +30,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - val userHelmetCode = intent.getStringExtra(Constant.INTENT_PARAM) - agentWeb = AgentWeb.with(this) .setAgentWebParent( binding.containerView, LinearLayout.LayoutParams( @@ -59,7 +57,7 @@ .ready() .go( "https://jls.huaweisoft.com/#/realvideo?" + - "id=${userHelmetCode}&" + + "id=${RuntimeCache.userHelmetCode}&" + "appKey=${LocaleConstant.HELMET_VIDEO_APP_KEY}&" + "secretKey=${LocaleConstant.HELMET_VIDEO_SECRET_KEY}" ) diff --git a/app/build.gradle b/app/build.gradle index 86f828d..83f9dbf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,15 @@ targetSdkVersion 33 versionCode 1030 versionName "1.0.3.0" +// flavorDimensions "versionCode" } +// productFlavors { +// br { +// applicationId "com.casic.br.operationsite.test" +// } +// } + buildTypes { release { minifyEnabled false 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 2d9719d..4806333 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 @@ -5,4 +5,5 @@ object RuntimeCache { val deviceModels = ArrayList() 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 aeaea64..69e34d0 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 @@ -11,12 +11,12 @@ 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.utils.Constant import com.pengxh.kt.lite.widget.TitleBarView class HelmetVideoActivity : KotlinBaseActivity() { @@ -30,8 +30,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - val userHelmetCode = intent.getStringExtra(Constant.INTENT_PARAM) - agentWeb = AgentWeb.with(this) .setAgentWebParent( binding.containerView, LinearLayout.LayoutParams( @@ -59,7 +57,7 @@ .ready() .go( "https://jls.huaweisoft.com/#/realvideo?" + - "id=${userHelmetCode}&" + + "id=${RuntimeCache.userHelmetCode}&" + "appKey=${LocaleConstant.HELMET_VIDEO_APP_KEY}&" + "secretKey=${LocaleConstant.HELMET_VIDEO_SECRET_KEY}" ) diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt index d81d90e..ca018d7 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt @@ -169,6 +169,7 @@ if (it.code == 200) { it.data.forEach { worker -> if (worker.lat.isNotBlank() && worker.lng.isNotBlank()) { + RuntimeCache.userHelmetCode = worker.hatCode if (!isSecondConfirm && !isThirdConfirm) { binding.firstCOValueView.text = "CO：${worker.co}ppm" diff --git a/app/build.gradle b/app/build.gradle index 86f828d..83f9dbf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,15 @@ targetSdkVersion 33 versionCode 1030 versionName "1.0.3.0" +// flavorDimensions "versionCode" } +// productFlavors { +// br { +// applicationId "com.casic.br.operationsite.test" +// } +// } + buildTypes { release { minifyEnabled false 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 2d9719d..4806333 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 @@ -5,4 +5,5 @@ object RuntimeCache { val deviceModels = ArrayList() 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 aeaea64..69e34d0 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 @@ -11,12 +11,12 @@ 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.utils.Constant import com.pengxh.kt.lite.widget.TitleBarView class HelmetVideoActivity : KotlinBaseActivity() { @@ -30,8 +30,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - val userHelmetCode = intent.getStringExtra(Constant.INTENT_PARAM) - agentWeb = AgentWeb.with(this) .setAgentWebParent( binding.containerView, LinearLayout.LayoutParams( @@ -59,7 +57,7 @@ .ready() .go( "https://jls.huaweisoft.com/#/realvideo?" + - "id=${userHelmetCode}&" + + "id=${RuntimeCache.userHelmetCode}&" + "appKey=${LocaleConstant.HELMET_VIDEO_APP_KEY}&" + "secretKey=${LocaleConstant.HELMET_VIDEO_SECRET_KEY}" ) diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt index d81d90e..ca018d7 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt @@ -169,6 +169,7 @@ if (it.code == 200) { it.data.forEach { worker -> if (worker.lat.isNotBlank() && worker.lng.isNotBlank()) { + RuntimeCache.userHelmetCode = worker.hatCode if (!isSecondConfirm && !isThirdConfirm) { binding.firstCOValueView.text = "CO：${worker.co}ppm" diff --git a/app/src/main/res/layout/activity_guardians.xml b/app/src/main/res/layout/activity_guardians.xml index 73c298f..7980f6a 100644 --- a/app/src/main/res/layout/activity_guardians.xml +++ b/app/src/main/res/layout/activity_guardians.xml @@ -218,7 +218,8 @@ android:layout_weight="1" android:background="@drawable/button_check_selector" android:text="地图" - android:textColor="@color/black" /> + android:textColor="@color/black" + android:visibility="gone" /> \ No newline at end of file