xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
qiji4215
2023-04-19 17:21:13 +08:00
parent 4f9f85d09d
commit 9d5b9b1755
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -53,8 +53,6 @@ android {
dependencies { dependencies {
implementation project(':collect-library') implementation project(':collect-library')
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

4
app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
View File

@@ -1,6 +1,7 @@
package com.navinfo.omqs package com.navinfo.omqs
import android.app.Application import android.app.Application
import com.navinfo.omqs.db.MyRealmModule
import com.navinfo.omqs.tools.FileManager import com.navinfo.omqs.tools.FileManager
import com.navinfo.omqs.ui.manager.TakePhotoManager import com.navinfo.omqs.ui.manager.TakePhotoManager
import com.navinfo.omqs.util.NetUtils import com.navinfo.omqs.util.NetUtils
@@ -8,8 +9,6 @@ import dagger.hilt.android.HiltAndroidApp
import org.videolan.vlc.Util import org.videolan.vlc.Util
import io.realm.Realm import io.realm.Realm
import io.realm.RealmConfiguration import io.realm.RealmConfiguration
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import java.io.File import java.io.File
@HiltAndroidApp @HiltAndroidApp
@@ -24,7 +23,6 @@ class OMQSApplication : Application() {
Realm.init(this) Realm.init(this)
val password = "password".encodeToByteArray().copyInto(ByteArray(64)) val password = "password".encodeToByteArray().copyInto(ByteArray(64))
// 1110000011000010111001101110011011101110110111101110010011001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 // 1110000011000010111001101110011011101110110111101110010011001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
// Log.d("", "密码是： ${BigInteger(1, password).toString(2).padStart(64, '0')}")
val config = RealmConfiguration.Builder() val config = RealmConfiguration.Builder()
.directory(File(Constant.DATA_PATH)) .directory(File(Constant.DATA_PATH))
.name("HDData") .name("HDData")

23
app/src/main/res/layout/activity_main.xml
View File

@@ -92,6 +92,29 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/right_fragment_nav_graph" /> 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> </androidx.constraintlayout.widget.ConstraintLayout>