Merge branch 'master' of gitlab.navinfo.com:vivo/navinfovivo

 Conflicts:

	app/build.gradle

	app/src/main/java/com/navinfo/volvo/ui/MainActivity.kt

	app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt

	app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageViewModel.kt

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

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

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

	app/src/main/res/navigation/mobile_navigation.xml

	app/src/main/res/values-night/themes.xml

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

app/build.gradle

@@ -121,6 +121,24 @@ dependencies {
 //    androidTestImplementation "com.google.dagger:hilt-android-testing:2.41"
 //    kaptAndroidTest "com.google.dagger:hilt-android-compiler:2.41"
 
+    // 显示错误提示 https://github.com/nhaarman/supertooltips
+    implementation 'com.nhaarman.supertooltips:library:3.0.0'
+
+    // 权限请求框架：https://github.com/getActivity/XXPermissions
+    implementation 'com.github.getActivity:XXPermissions:16.5'
+
+    // 相机库 https://natario1.github.io/CameraView/about/getting-started
+    implementation("com.otaliastudios:cameraview:2.7.2")
+    // 图片压缩算法 https://github.com/Curzibn/Luban
+    implementation 'top.zibin:Luban:1.1.8'
+    // Android工具类库 https://github.com/gycold/EasyAndroid
+    implementation 'io.github.gycold:easyandroid:2.0.7'
+    // 日志工具 https://github.com/elvishew/xLog/blob/master/README_ZH.md
+    implementation 'com.elvishew:xlog:1.10.1'
+    //加载图片的依赖包
+    implementation ("com.github.bumptech.glide:glide:4.11.0") {
+        exclude group: "com.android.support"
+    }
 }
 
 kapt {