diff --git a/app/build.gradle b/app/build.gradle index 2d69a78..414e67a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,8 +56,7 @@ applicationVariants.all { variant -> variant.outputs.all { -// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" - outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" + outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +68,7 @@ } static def getBuildDate() { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA) + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA) return dateFormat.format(System.currentTimeMillis()) } diff --git a/app/build.gradle b/app/build.gradle index 2d69a78..414e67a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,8 +56,7 @@ applicationVariants.all { variant -> variant.outputs.all { -// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" - outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" + outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +68,7 @@ } static def getBuildDate() { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA) + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA) return dateFormat.format(System.currentTimeMillis()) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 655099b..a94b9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -210,6 +210,10 @@ } } + noticeSwitcherLayout.setOnClickListener { + requireContext().navigatePageTo() + } + noticeLayout.setOnClickListener { requireContext().navigatePageTo() } diff --git a/app/build.gradle b/app/build.gradle index 2d69a78..414e67a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,8 +56,7 @@ applicationVariants.all { variant -> variant.outputs.all { -// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" - outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" + outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +68,7 @@ } static def getBuildDate() { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA) + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA) return dateFormat.format(System.currentTimeMillis()) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 655099b..a94b9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -210,6 +210,10 @@ } } + noticeSwitcherLayout.setOnClickListener { + requireContext().navigatePageTo() + } + noticeLayout.setOnClickListener { requireContext().navigatePageTo() } diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt index 2c30824..7b47a91 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt @@ -34,8 +34,7 @@ agentWeb = AgentWeb.with(this) .setAgentWebParent( - containerView, - LinearLayout.LayoutParams( + containerView, LinearLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT ) ) @@ -59,7 +58,6 @@ webView.settings.builtInZoomControls = true webView.settings.setSupportZoom(true) webView.settings.displayZoomControls = false - webView.setInitialScale(4) } override fun initEvent() { diff --git a/app/build.gradle b/app/build.gradle index 2d69a78..414e67a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,8 +56,7 @@ applicationVariants.all { variant -> variant.outputs.all { -// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" - outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" + outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +68,7 @@ } static def getBuildDate() { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA) + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA) return dateFormat.format(System.currentTimeMillis()) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 655099b..a94b9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -210,6 +210,10 @@ } } + noticeSwitcherLayout.setOnClickListener { + requireContext().navigatePageTo() + } + noticeLayout.setOnClickListener { requireContext().navigatePageTo() } diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt index 2c30824..7b47a91 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt @@ -34,8 +34,7 @@ agentWeb = AgentWeb.with(this) .setAgentWebParent( - containerView, - LinearLayout.LayoutParams( + containerView, LinearLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT ) ) @@ -59,7 +58,6 @@ webView.settings.builtInZoomControls = true webView.settings.setSupportZoom(true) webView.settings.displayZoomControls = false - webView.setInitialScale(4) } override fun initEvent() { diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e525b93..8cc77a0 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -90,6 +90,7 @@ app:spanCount="4" /> variant.outputs.all { -// outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" - outputFileName = "XZJL_" + getBuildDate() + "_Beta.apk" + outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -69,7 +68,7 @@ } static def getBuildDate() { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA) + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.CHINA) return dateFormat.format(System.currentTimeMillis()) } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 655099b..a94b9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -210,6 +210,10 @@ } } + noticeSwitcherLayout.setOnClickListener { + requireContext().navigatePageTo() + } + noticeLayout.setOnClickListener { requireContext().navigatePageTo() } diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt index 2c30824..7b47a91 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt @@ -34,8 +34,7 @@ agentWeb = AgentWeb.with(this) .setAgentWebParent( - containerView, - LinearLayout.LayoutParams( + containerView, LinearLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT ) ) @@ -59,7 +58,6 @@ webView.settings.builtInZoomControls = true webView.settings.setSupportZoom(true) webView.settings.displayZoomControls = false - webView.setInitialScale(4) } override fun initEvent() { diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e525b93..8cc77a0 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -90,6 +90,7 @@ app:spanCount="4" /> 华东计量 - 中国航天科工二〇三所 + 中国航天科工集团二院二〇三所 数据加载中… \ No newline at end of file