From 9d5b9b17556cda0b0af571dda25009982932c001 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Wed, 19 Apr 2023 17:21:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  2 --
 .../java/com/navinfo/omqs/OMQSApplication.kt  |  4 +---
 app/src/main/res/layout/activity_main.xml     | 23 +++++++++++++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3e620a48..cf6297f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,8 +53,6 @@ android {
 
 dependencies {
     implementation project(':collect-library')
-
-
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
diff --git a/app/src/main/java/com/navinfo/omqs/OMQSApplication.kt b/app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
index 89d2edff..e8ccf168 100644
--- a/app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
+++ b/app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
@@ -1,6 +1,7 @@
 package com.navinfo.omqs
 
 import android.app.Application
+import com.navinfo.omqs.db.MyRealmModule
 import com.navinfo.omqs.tools.FileManager
 import com.navinfo.omqs.ui.manager.TakePhotoManager
 import com.navinfo.omqs.util.NetUtils
@@ -8,8 +9,6 @@ import dagger.hilt.android.HiltAndroidApp
 import org.videolan.vlc.Util
 import io.realm.Realm
 import io.realm.RealmConfiguration
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import java.io.File
 
 @HiltAndroidApp
@@ -24,7 +23,6 @@ class OMQSApplication : Application() {
         Realm.init(this)
         val password = "password".encodeToByteArray().copyInto(ByteArray(64))
         // 1110000011000010111001101110011011101110110111101110010011001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-//        Log.d("", "密码是： ${BigInteger(1, password).toString(2).padStart(64, '0')}")
         val config = RealmConfiguration.Builder()
             .directory(File(Constant.DATA_PATH))
             .name("HDData")
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f15ff59a..0ae01598 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -92,6 +92,29 @@
                 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="@mipmap/icon_page_video_a1"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageButton
+                android:id="@+id/main_activity_camera2"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:visibility="gone"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="20dp"
+                android:onClick="@{()->mainActivity.openCamera()}"
+                android:src="@drawable/baseline_person_24"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
 
         </androidx.constraintlayout.widget.ConstraintLayout>