Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

 Conflicts:

	app/src/main/java/com/navinfo/omqs/tools/LayerConfigUtils.kt

app/src/main/AndroidManifest.xml

@@ -36,7 +36,7 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/icon_logo"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

@@ -111,6 +111,17 @@ class MainActivity : BaseActivity() {
             //处理页面跳转
             viewModel.navigation(this, it)
         }
+
+        viewModel.liveDataMenuState.observe(this) {
+            binding.mainActivityMenu.isSelected = it
+            if(it==true){
+                binding.mainActivityMenuLayout.visibility = View.VISIBLE
+            }else{
+                binding.mainActivityMenuLayout.visibility = View.GONE
+            }
+
+        }
+
         binding.mainActivitySignRecyclerview.layoutManager = LinearLayoutManager(this)
         binding.mainActivitySignRecyclerview.adapter = signAdapter
         //增加4dp的间隔
@@ -175,6 +186,43 @@ class MainActivity : BaseActivity() {
         viewModel.onClickCameraButton(this)
     }
 
+    /**
+     * 开关菜单
+     */
+    fun onClickMenu() {
+        //显示菜单图层
+        viewModel.onClickMenu()
+    }
+
+    /**
+     * 点击计算
+     */
+    fun onClickCalcDisance() {
+
+    }
+
+    /**
+     * 点击轨迹
+     */
+    fun onClickTrace() {
+
+    }
+
+    /**
+     * 点击搜索
+     */
+    fun onClickSerach() {
+
+    }
+
+    /**
+     * 点击2\3D
+     */
+    fun onClick2DOr3D() {
+
+    }
+
+
     /**
      * 点击录音按钮
      */

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt

@@ -83,6 +83,10 @@ class MainViewModel @Inject constructor(
     var volume: ImageView? = null
     var mSoundMeter: SoundMeter? = null
 
+    var menuState :Boolean = false
+
+    val liveDataMenuState = MutableLiveData<Boolean>()
+
     init {
         mapController.markerHandle.setOnQsRecordItemClickListener(object :
             OnQsRecordItemClickListener {
@@ -221,6 +225,14 @@ class MainViewModel @Inject constructor(
         mapController.locationLayerHandler.animateToCurrentPosition()
     }
 
+    /**
+     * 点击菜单
+     */
+    fun onClickMenu() {
+        menuState = !menuState
+        liveDataMenuState.postValue(menuState)
+    }
+
     override fun onCleared() {
         super.onCleared()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {

app/src/main/res/drawable/chk_icon_menu_open_close_xml.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:drawable="@drawable/icon_open">
+    </item>
+    <item android:state_selected="true" android:drawable="@drawable/icon_open">
+    </item>
+    <item android:drawable="@drawable/icon_close">
+    </item>
+</selector>

app/src/main/res/drawable/fm_card_map_down_status_bg.xml

@@ -2,30 +2,30 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false">
         <shape>
-            <stroke android:width="1.1dp" android:color="@color/cv_gray_153" />
-            <solid android:color="@color/cv_gray_153" />
             <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
+            <solid android:color="@color/cv_gray_153" />
+            <stroke android:width="1.1dp" android:color="@color/cv_gray_153" />
         </shape>
     </item>
     <item android:state_pressed="true">
         <shape>
-            <stroke android:width="1.1dp" android:color="@color/white" />
-            <solid android:color="@color/white" />
             <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
+            <solid android:color="@color/white" />
+            <stroke android:width="1.1dp" android:color="@color/white" />
         </shape>
     </item>
     <item android:state_selected="true">
         <shape>
-            <stroke android:width="1.1dp" android:color="@color/cvm_red" />
-            <solid android:color="@color/cvm_red" />
             <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
+            <solid android:color="@color/cvm_red" />
+            <stroke android:width="1.1dp" android:color="@color/cvm_red" />
         </shape>
     </item>
     <item>
         <shape>
-            <stroke android:width="1.1dp" android:color="@color/btn_blue_solid" />
-            <solid android:color="@color/transp" />
             <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
+            <solid android:color="@color/transp" />
+            <stroke android:width="1.1dp" android:color="@color/btn_blue_solid" />
         </shape>
     </item>
 

app/src/main/res/layout/activity_main.xml

@@ -56,6 +56,73 @@
                 app:layout_constraintLeft_toLeftOf="@id/main_activity_person_center"
                 app:layout_constraintTop_toBottomOf="@id/main_activity_person_center" />
 
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:layout_marginTop="10dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                tools:ignore="MissingConstraints">
+
+                <LinearLayout
+                    android:id="@+id/main_activity_menu_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    android:orientation="horizontal">
+
+                    <ImageButton
+                        android:id="@+id/main_activity_serach"
+                        android:onClick="@{()->mainActivity.onClickSerach()}"
+                        android:background="@drawable/icon_serach"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                    <ImageButton
+                        android:id="@+id/main_activity_2d_3d"
+                        android:background="@drawable/icon_2d_3d"
+                        android:onClick="@{()->mainActivity.onClick2DOr3D()}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                    <ImageButton
+                        android:id="@+id/main_activity_camera"
+                        android:background="@drawable/icon_page_video_a1"
+                        android:onClick="@{()->mainActivity.openCamera()}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                    <ImageButton
+                        android:id="@+id/main_activity_trace"
+                        android:onClick="@{()->mainActivity.onClickTrace()}"
+                        android:background="@drawable/icon_trace"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                    <ImageButton
+                        android:id="@+id/main_activity_calc_disance"
+                        android:background="@drawable/icon_calc_disance"
+                        android:onClick="@{()->mainActivity.onClickCalcDisance()}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+
+                </LinearLayout>
+
+
+                <ImageButton
+                    android:layout_marginTop="5dp"
+                    android:id="@+id/main_activity_menu"
+                    android:background="@drawable/chk_icon_menu_open_close_xml"
+                    android:onClick="@{()->mainActivity.onClickMenu()}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+            </LinearLayout>
+
+
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="wrap_content"
@@ -111,23 +178,12 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintHorizontal_weight="4"
+                app:layout_constraintHorizontal_weight="2.5"
                 app:layout_constraintLeft_toRightOf="@id/main_activity_middle_fragment"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:navGraph="@navigation/right_fragment_nav_graph" />
 
-            <ImageButton
-                android:id="@+id/main_activity_camera"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="160dp"
-                android:layout_marginTop="20dp"
-                android:onClick="@{()->mainActivity.openCamera()}"
-                android:src="@drawable/icon_page_video_a1"
-                android:background="@null"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
 
             <ImageButton
                 android:id="@+id/main_activity_camera2"

app/src/main/res/layout/cv_map_top_right_menu.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:padding="20dp">
+
+    <ImageButton
+        android:background="@drawable/icon_serach"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <ImageButton
+        android:background="@drawable/icon_2d_3d"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <ImageButton
+        android:id="@+id/main_activity_camera"
+        android:background="@drawable/icon_page_video_a1"
+        android:onClick="@{()->mainActivity.openCamera()}"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <ImageButton
+        android:background="@drawable/icon_trace"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <ImageButton
+        android:background="@drawable/icon_calc_disance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+
+</LinearLayout>
+

app/src/main/res/layout/fragment_evaluation_result.xml

@@ -40,7 +40,7 @@
         <androidx.core.widget.NestedScrollView
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="5dp"
             android:padding="10dp"
             app:layout_constraintBottom_toTopOf="@id/evaluation_camera"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -52,65 +52,134 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
+            <LinearLayout
+                android:paddingBottom="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
                 <TextView
+                    style="@style/card_content_font_default"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="问题分类" />
+                    android:text="要素分类" />
 
                 <TextView
                     android:id="@+id/evaluation_class_type"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
+                    style="@style/card_text_font_default"
-                    android:background="@drawable/fm_card_map_down_status_bg"
                     android:onClick="@{fragment::onClick}"
                     android:text="@{viewModel.liveDataQsRecordBean.classType}" />
 
+            </LinearLayout>
+
+            <LinearLayout
+                android:paddingBottom="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
+                <TextView
+                    style="@style/card_content_font_default"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="问题类型" />
+
                 <TextView
                     android:id="@+id/evaluation_problem_type"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
+                    style="@style/card_text_font_default"
-                    android:background="@drawable/fm_card_map_down_status_bg"
                     android:onClick="@{fragment::onClick}"
                     android:text="@{viewModel.liveDataQsRecordBean.problemType}" />
 
+            </LinearLayout>
+
+            <LinearLayout
+                android:paddingBottom="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
+                <TextView
+                    style="@style/card_content_font_default"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="问题现象" />
+
             <TextView
                     android:id="@+id/evaluation_phenomenon"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
+                    style="@style/card_text_font_default"
-                    android:background="@drawable/fm_card_map_down_status_bg"
                     android:onClick="@{fragment::onClick}"
                     android:text="@{viewModel.liveDataQsRecordBean.phenomenon}" />
 
+            </LinearLayout>
+
+            <LinearLayout
+                android:paddingBottom="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
+                <TextView
+                    style="@style/card_content_font_default"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="问题环节" />
+
                 <TextView
                     android:id="@+id/evaluation_link"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
+                    style="@style/card_text_font_default"
-                    android:background="@drawable/fm_card_map_down_status_bg"
                     android:onClick="@{fragment::onClick}"
                     android:text="@{viewModel.liveDataQsRecordBean.problemLink}" />
 
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:paddingBottom="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
+                <TextView
+                    style="@style/card_content_font_default"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="问题原因" />
+
                 <TextView
                     android:id="@+id/evaluation_cause"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
+                    style="@style/card_text_font_default"
-                    android:background="@drawable/fm_card_map_down_status_bg"
                     android:onClick="@{fragment::onClick}"
                     android:text="@{viewModel.liveDataQsRecordBean.cause}" />
 
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:paddingBottom="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
                 <TextView
+                    style="@style/card_content_font_default"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="备注信息" />
+                    android:text="问题描述" />
 
                 <com.navinfo.omqs.ui.widget.MyEditeText
+                    style="@style/card_text_font_default"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/fm_card_map_down_status_bg"
                     android:gravity="start"
                     android:hint="请输入备注信息"
                     android:inputType="textMultiLine"
@@ -118,6 +187,9 @@
                     android:maxLines="3"
                     android:text="@={viewModel.liveDataQsRecordBean.description}" />
 
+
+            </LinearLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"

app/src/main/res/menu/evaluation_bar_mean.xml

@@ -11,7 +11,7 @@
     <item
         android:id="@+id/save"
         android:contentDescription="保存数据"
-        android:icon="@drawable/baseline_save_24"
+        android:icon="@drawable/icon_save"
         android:title="保存"
         app:showAsAction="ifRoom" />
 

app/src/main/res/values/colors.xml

@@ -164,6 +164,7 @@
     <color name="cvm_red">#FF3B30</color>
     <color name="btn_blue_solid">#108ee9</color>
     <color name="titleColor">#2631DD</color>
+    <color name="contentColor">#000000</color>
     <!-- 一键连接对话框背景色 -->
     <color name="bg_gray2">#d1d1d1</color>
     <!-- 一键连接时间显示区域背景色 -->

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">OMQualityInspection</string>
+    <string name="app_name">LandScope</string>
     <string name="action_settings">Settings</string>
     <!-- Strings used for fragments for navigation -->
     <string name="personal_center">个人中心</string>

app/src/main/res/values/styles.xml

@@ -32,6 +32,28 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
+    <!-- 默认字体 -->
+    <style name="card_content_font_default">
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textSize">@dimen/card_title_font_2size</item>
+        <item name="android:textColor">@color/contentColor</item>
+        <item name="android:padding">10dp</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <!-- 默认显示内容字体 -->
+    <style name="card_text_font_default">
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textSize">@dimen/card_title_font_2size</item>
+        <item name="android:textColor">@color/titleColor</item>
+        <item name="android:padding">10dp</item>
+        <item name="android:drawableRight">@drawable/icon_down_arrow</item>
+        <item name="android:background">@drawable/fm_card_map_down_status_bg</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
     <!-- 默认字体 -->
     <style name="content_font_default_size_13sp">
         <item name="android:gravity">center_vertical</item>

collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java

@@ -249,7 +249,7 @@ public final class NIMapView extends RelativeLayout {
 
         // 增加比例尺图层
         NaviMapScaleBar naviMapScaleBar = new NaviMapScaleBar(getVtmMap());
-        naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_LEFT, 20, 84);
+        naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 5);
 
 //        if (gridLayer == null) {
 //            gridLayer = new TileGridLayer(getVtmMap());

collect-library/src/main/res/layout/base_map_layout.xml

@@ -12,9 +12,9 @@
         android:id="@+id/navinfo_map_compass"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentLeft="true"
-        android:layout_marginTop="50dp"
+        android:layout_marginBottom="72dp"
         android:padding="@dimen/nimap_defalut_padding"
         android:src="@mipmap/compass" />