diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 732be49..f0ee3a5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + + () } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 732be49..f0ee3a5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + () } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt new file mode 100644 index 0000000..d6ef778 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt @@ -0,0 +1,85 @@ +package com.casic.xz.meterage.view + +import android.app.ProgressDialog +import android.view.View +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.BuildConfig +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.vm.FileViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show +import kotlinx.android.synthetic.main.activity_version_control.* +import kotlinx.android.synthetic.main.include_base_title.* + +class VersionControlActivity : ApplicationBaseActivity() { + + private lateinit var fileViewModel: FileViewModel + private lateinit var progressDialog: ProgressDialog + + override fun initLayoutView(): Int = R.layout.activity_version_control + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.visibility = View.GONE + } + + override fun initData() { + versionView.text = "Version ${BuildConfig.VERSION_NAME}" + + //初始化下载对话框 + progressDialog = ProgressDialog(this) + progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) + progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) + progressDialog.setCanceledOnTouchOutside(false) + progressDialog.setCancelable(false) + + fileViewModel = ViewModelProvider(this)[FileViewModel::class.java] + fileViewModel.versionResult.observe(this) { +// if (BuildConfig.VERSION_NAME == it.version) { +// "已是最新版本，无需更新".show(this) +// } else { +// AlertControlDialog.Builder() +// .setContext(this) +// .setTitle("提示") +// .setMessage("有新版本，是否更新？") +// .setNegativeButton("稍后再说") +// .setPositiveButton("立即下载") +// .setOnDialogButtonClickListener(object : +// AlertControlDialog.OnDialogButtonClickListener { +// override fun onConfirmClick() { +// downloadApk(it.downloadUrl) +// } +// +// override fun onCancelClick() { +// +// } +// }).build().show() +// } + } + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + introduceLayout.setOnClickListener { + "未实现".show(this) + } + + updateLayout.setOnClickListener { +// fileViewModel.updateVersion() + "未实现".show(this) + } + + privacyView.setOnClickListener { + navigatePageTo() + } + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 732be49..f0ee3a5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + () } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt new file mode 100644 index 0000000..d6ef778 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt @@ -0,0 +1,85 @@ +package com.casic.xz.meterage.view + +import android.app.ProgressDialog +import android.view.View +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.BuildConfig +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.vm.FileViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show +import kotlinx.android.synthetic.main.activity_version_control.* +import kotlinx.android.synthetic.main.include_base_title.* + +class VersionControlActivity : ApplicationBaseActivity() { + + private lateinit var fileViewModel: FileViewModel + private lateinit var progressDialog: ProgressDialog + + override fun initLayoutView(): Int = R.layout.activity_version_control + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.visibility = View.GONE + } + + override fun initData() { + versionView.text = "Version ${BuildConfig.VERSION_NAME}" + + //初始化下载对话框 + progressDialog = ProgressDialog(this) + progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) + progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) + progressDialog.setCanceledOnTouchOutside(false) + progressDialog.setCancelable(false) + + fileViewModel = ViewModelProvider(this)[FileViewModel::class.java] + fileViewModel.versionResult.observe(this) { +// if (BuildConfig.VERSION_NAME == it.version) { +// "已是最新版本，无需更新".show(this) +// } else { +// AlertControlDialog.Builder() +// .setContext(this) +// .setTitle("提示") +// .setMessage("有新版本，是否更新？") +// .setNegativeButton("稍后再说") +// .setPositiveButton("立即下载") +// .setOnDialogButtonClickListener(object : +// AlertControlDialog.OnDialogButtonClickListener { +// override fun onConfirmClick() { +// downloadApk(it.downloadUrl) +// } +// +// override fun onCancelClick() { +// +// } +// }).build().show() +// } + } + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + introduceLayout.setOnClickListener { + "未实现".show(this) + } + + updateLayout.setOnClickListener { +// fileViewModel.updateVersion() + "未实现".show(this) + } + + privacyView.setOnClickListener { + navigatePageTo() + } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml new file mode 100644 index 0000000..92f10fd --- /dev/null +++ b/app/src/main/res/layout/activity_version_control.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 732be49..f0ee3a5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + () } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt new file mode 100644 index 0000000..d6ef778 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt @@ -0,0 +1,85 @@ +package com.casic.xz.meterage.view + +import android.app.ProgressDialog +import android.view.View +import androidx.lifecycle.ViewModelProvider +import com.casic.xz.meterage.BuildConfig +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.vm.FileViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show +import kotlinx.android.synthetic.main.activity_version_control.* +import kotlinx.android.synthetic.main.include_base_title.* + +class VersionControlActivity : ApplicationBaseActivity() { + + private lateinit var fileViewModel: FileViewModel + private lateinit var progressDialog: ProgressDialog + + override fun initLayoutView(): Int = R.layout.activity_version_control + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.visibility = View.GONE + } + + override fun initData() { + versionView.text = "Version ${BuildConfig.VERSION_NAME}" + + //初始化下载对话框 + progressDialog = ProgressDialog(this) + progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) + progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) + progressDialog.setCanceledOnTouchOutside(false) + progressDialog.setCancelable(false) + + fileViewModel = ViewModelProvider(this)[FileViewModel::class.java] + fileViewModel.versionResult.observe(this) { +// if (BuildConfig.VERSION_NAME == it.version) { +// "已是最新版本，无需更新".show(this) +// } else { +// AlertControlDialog.Builder() +// .setContext(this) +// .setTitle("提示") +// .setMessage("有新版本，是否更新？") +// .setNegativeButton("稍后再说") +// .setPositiveButton("立即下载") +// .setOnDialogButtonClickListener(object : +// AlertControlDialog.OnDialogButtonClickListener { +// override fun onConfirmClick() { +// downloadApk(it.downloadUrl) +// } +// +// override fun onCancelClick() { +// +// } +// }).build().show() +// } + } + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + introduceLayout.setOnClickListener { + "未实现".show(this) + } + + updateLayout.setOnClickListener { +// fileViewModel.updateVersion() + "未实现".show(this) + } + + privacyView.setOnClickListener { + navigatePageTo() + } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml new file mode 100644 index 0000000..92f10fd --- /dev/null +++ b/app/src/main/res/layout/activity_version_control.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fa17c10..99e8c4d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,6 +2,8 @@ 华东计量 中国航天科工集团二院二〇三所 数据加载中… + 中国航天科工集团二院二〇三所 版权所有 + Copyright © 2023 – 2050 Casic. All rights reserved. \u3000\u3000智慧计量业务 App 尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，智慧计量业务 App 会按照本隐私权政策的规定使用和披露您的个人信息。但智慧计量业务 App 将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，智慧计量业务 App 不会将这些信息对外披露或向第三方提供。智慧计量业务 App 会不时更新本隐私权政策。 您在同意智慧计量业务 App 服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于智慧计量业务 App 服务使用协议不可分割的一部分。