merge code

app/build.gradle

@@ -6,6 +6,12 @@ plugins {
     id 'kotlin-parcelize' // 序列化
     id 'androidx.navigation.safeargs.kotlin'//Safe Args传递数据
 }
+
+//定义时间
+def releaseTime() {
+    return new Date().format("yyyyMMdd", TimeZone.getTimeZone("UTC"))
+}
+
 android {
     namespace 'com.navinfo.omqs'
     compileSdk 33

app/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:versionCode="3"
+    android:versionName="1.4"
     package="com.navinfo.omqs">
     <!-- 这个权限用于进行网络定位-->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

app/src/main/java/com/navinfo/omqs/ui/activity/console/ConsoleActivity.kt

@@ -199,7 +199,7 @@ class ConsoleActivity : BaseActivity(), OnClickListener {
                  * 图层设置
                  */
                 R.id.console_layer_setting_bg, R.id.console_layer_setting_icon_bg -> {
-                    if (sceneFlag) {
+/*                    if (sceneFlag) {
                         mFragment = LayermanagerFragment()
                         sceneFlag = false
                         TransitionManager.go(bScene, bTransition)
@@ -210,7 +210,7 @@ class ConsoleActivity : BaseActivity(), OnClickListener {
                                 .replace(fragmentId, mFragment!!).commit()
                         }
                         return
-                    }
+                    }*/
                 }
                 /**
                  * 测评结果列表

build.gradle

@@ -13,6 +13,7 @@ plugins {
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
     id 'com.google.dagger.hilt.android' version '2.44' apply false
 }
+
 static def androidCompileSdk() { return 33 }
 allprojects {
     ext.gdxVersion = "1.11.0"