diff --git a/app/build.gradle b/app/build.gradle
index 199d51c4..525a541d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,6 +30,21 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
+
+ signingConfigs {
+ debug {
+ storeFile file('D:/WrokSpace/OneMapQS/fastmap.keystore')
+ storePassword "navinfo"
+ keyAlias "fastmap"
+ keyPassword "navinfo"
+ }
+ }
+
+ dexOptions {
+ jumboMode = true
+ javaMaxHeapSize "4096M"
+ }
+
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
diff --git a/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java b/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java
index ccdbc354..d0959449 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java
+++ b/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java
@@ -714,38 +714,38 @@ public class CommonDialog extends Dialog implements SurfaceHolder.Callback, IVid
if (indexClentCamera == 2)
resId = R.id.main_activity_camera2;
- Drawable drawable = context.getResources().getDrawable(R.mipmap.icon_page_video_a0);
+ Drawable drawable = context.getResources().getDrawable(R.drawable.icon_page_video_a0);
ShareUtil shareUtil = new ShareUtil(context, indexClentCamera);
//0为录像模式
if (shareUtil.getTakeCameraMode() == 0) {
switch (statusType) {
case 0:
- drawable = context.getResources().getDrawable(R.mipmap.icon_page_video_a0);
+ drawable = context.getResources().getDrawable(R.drawable.icon_page_video_a0);
break;
case 1:
- drawable = context.getResources().getDrawable(R.mipmap.icon_page_video_a1);
+ drawable = context.getResources().getDrawable(R.drawable.icon_page_video_a1);
break;
case 2:
- drawable = context.getResources().getDrawable(R.mipmap.icon_page_video_a2);
+ drawable = context.getResources().getDrawable(R.drawable.icon_page_video_a2);
break;
case 3:
- drawable = context.getResources().getDrawable(R.mipmap.icon_page_video_a3);
+ drawable = context.getResources().getDrawable(R.drawable.icon_page_video_a3);
break;
}
} else {
switch (statusType) {
case 0:
- drawable = context.getResources().getDrawable(R.mipmap.icon_page_take_photo_a0);
+ drawable = context.getResources().getDrawable(R.drawable.icon_page_take_photo_a0);
break;
case 1:
- drawable = context.getResources().getDrawable(R.mipmap.icon_page_take_photo_a1);
+ drawable = context.getResources().getDrawable(R.drawable.icon_page_take_photo_a1);
break;
case 2:
- drawable = context.getResources().getDrawable(R.mipmap.icon_page_take_photo_a2);
+ drawable = context.getResources().getDrawable(R.drawable.icon_page_take_photo_a2);
break;
case 3:
- drawable = context.getResources().getDrawable(R.mipmap.icon_page_take_photo_a3);
+ drawable = context.getResources().getDrawable(R.drawable.icon_page_take_photo_a3);
break;
}
}
@@ -1597,9 +1597,9 @@ public class CommonDialog extends Dialog implements SurfaceHolder.Callback, IVid
}
private void setmImgViewImageDrawable(int type) {
- Drawable drawable = getContext().getResources().getDrawable(R.mipmap.icon_camera_img);
+ Drawable drawable = getContext().getResources().getDrawable(R.drawable.icon_camera_img);
if (type == 1)
- drawable = getContext().getResources().getDrawable(R.mipmap.icon_camera_take_photo_img);
+ drawable = getContext().getResources().getDrawable(R.drawable.icon_camera_take_photo_img);
if (mImgView != null)
mImgView.setImageDrawable(drawable);
diff --git a/app/src/main/res/mipmap-xhdpi/icon_camera_close_normal.png b/app/src/main/res/drawable-xhdpi/icon_camera_close_normal.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_camera_close_normal.png
rename to app/src/main/res/drawable-xhdpi/icon_camera_close_normal.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_camera_close_press.png b/app/src/main/res/drawable-xhdpi/icon_camera_close_press.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_camera_close_press.png
rename to app/src/main/res/drawable-xhdpi/icon_camera_close_press.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_camera_end.png b/app/src/main/res/drawable-xhdpi/icon_camera_end.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_camera_end.png
rename to app/src/main/res/drawable-xhdpi/icon_camera_end.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_camera_img.png b/app/src/main/res/drawable-xhdpi/icon_camera_img.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_camera_img.png
rename to app/src/main/res/drawable-xhdpi/icon_camera_img.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_camera_off.png b/app/src/main/res/drawable-xhdpi/icon_camera_off.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_camera_off.png
rename to app/src/main/res/drawable-xhdpi/icon_camera_off.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_camera_on.png b/app/src/main/res/drawable-xhdpi/icon_camera_on.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_camera_on.png
rename to app/src/main/res/drawable-xhdpi/icon_camera_on.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_camera_start.png b/app/src/main/res/drawable-xhdpi/icon_camera_start.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_camera_start.png
rename to app/src/main/res/drawable-xhdpi/icon_camera_start.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_camera_start_disable.png b/app/src/main/res/drawable-xhdpi/icon_camera_start_disable.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_camera_start_disable.png
rename to app/src/main/res/drawable-xhdpi/icon_camera_start_disable.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_camera_take_photo_img.png b/app/src/main/res/drawable-xhdpi/icon_camera_take_photo_img.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_camera_take_photo_img.png
rename to app/src/main/res/drawable-xhdpi/icon_camera_take_photo_img.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_camera_time.png b/app/src/main/res/drawable-xhdpi/icon_camera_time.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_camera_time.png
rename to app/src/main/res/drawable-xhdpi/icon_camera_time.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_page_take_photo_a0.png b/app/src/main/res/drawable-xhdpi/icon_page_take_photo_a0.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_page_take_photo_a0.png
rename to app/src/main/res/drawable-xhdpi/icon_page_take_photo_a0.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_page_take_photo_a1.png b/app/src/main/res/drawable-xhdpi/icon_page_take_photo_a1.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_page_take_photo_a1.png
rename to app/src/main/res/drawable-xhdpi/icon_page_take_photo_a1.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_page_take_photo_a2.png b/app/src/main/res/drawable-xhdpi/icon_page_take_photo_a2.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_page_take_photo_a2.png
rename to app/src/main/res/drawable-xhdpi/icon_page_take_photo_a2.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_page_take_photo_a3.png b/app/src/main/res/drawable-xhdpi/icon_page_take_photo_a3.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_page_take_photo_a3.png
rename to app/src/main/res/drawable-xhdpi/icon_page_take_photo_a3.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_page_video_a0.png b/app/src/main/res/drawable-xhdpi/icon_page_video_a0.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_page_video_a0.png
rename to app/src/main/res/drawable-xhdpi/icon_page_video_a0.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_page_video_a1.png b/app/src/main/res/drawable-xhdpi/icon_page_video_a1.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_page_video_a1.png
rename to app/src/main/res/drawable-xhdpi/icon_page_video_a1.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_page_video_a2.png b/app/src/main/res/drawable-xhdpi/icon_page_video_a2.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_page_video_a2.png
rename to app/src/main/res/drawable-xhdpi/icon_page_video_a2.png
diff --git a/app/src/main/res/mipmap-xhdpi/icon_page_video_a3.png b/app/src/main/res/drawable-xhdpi/icon_page_video_a3.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/icon_page_video_a3.png
rename to app/src/main/res/drawable-xhdpi/icon_page_video_a3.png
diff --git a/app/src/main/res/mipmap-xhdpi/record_select.png b/app/src/main/res/drawable-xhdpi/record_select.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/record_select.png
rename to app/src/main/res/drawable-xhdpi/record_select.png
diff --git a/app/src/main/res/mipmap-xhdpi/takephoto_select.png b/app/src/main/res/drawable-xhdpi/takephoto_select.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/takephoto_select.png
rename to app/src/main/res/drawable-xhdpi/takephoto_select.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_camera_close_normal.png b/app/src/main/res/drawable-xxhdpi/icon_camera_close_normal.png
new file mode 100644
index 00000000..8290ed44
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_camera_close_normal.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_camera_close_press.png b/app/src/main/res/drawable-xxhdpi/icon_camera_close_press.png
new file mode 100644
index 00000000..59f00328
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_camera_close_press.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_camera_end.png b/app/src/main/res/drawable-xxhdpi/icon_camera_end.png
new file mode 100644
index 00000000..09e2ead9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_camera_end.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_camera_img.png b/app/src/main/res/drawable-xxhdpi/icon_camera_img.png
new file mode 100644
index 00000000..f43569ec
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_camera_img.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_camera_off.png b/app/src/main/res/drawable-xxhdpi/icon_camera_off.png
new file mode 100644
index 00000000..c184fa69
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_camera_off.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_camera_on.png b/app/src/main/res/drawable-xxhdpi/icon_camera_on.png
new file mode 100644
index 00000000..77c08ef2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_camera_on.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_camera_start.png b/app/src/main/res/drawable-xxhdpi/icon_camera_start.png
new file mode 100644
index 00000000..f3cb8821
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_camera_start.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_camera_start_disable.png b/app/src/main/res/drawable-xxhdpi/icon_camera_start_disable.png
new file mode 100644
index 00000000..e66018ef
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_camera_start_disable.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_camera_take_photo_img.png b/app/src/main/res/drawable-xxhdpi/icon_camera_take_photo_img.png
new file mode 100644
index 00000000..ec88d2af
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_camera_take_photo_img.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_camera_time.png b/app/src/main/res/drawable-xxhdpi/icon_camera_time.png
new file mode 100644
index 00000000..94777f50
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_camera_time.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_page_take_photo_a0.png b/app/src/main/res/drawable-xxhdpi/icon_page_take_photo_a0.png
new file mode 100644
index 00000000..8916ca0d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_page_take_photo_a0.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_page_take_photo_a1.png b/app/src/main/res/drawable-xxhdpi/icon_page_take_photo_a1.png
new file mode 100644
index 00000000..b9b30d8a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_page_take_photo_a1.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_page_take_photo_a2.png b/app/src/main/res/drawable-xxhdpi/icon_page_take_photo_a2.png
new file mode 100644
index 00000000..ca4a4e80
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_page_take_photo_a2.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_page_take_photo_a3.png b/app/src/main/res/drawable-xxhdpi/icon_page_take_photo_a3.png
new file mode 100644
index 00000000..d513a9d9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_page_take_photo_a3.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_page_video_a1.png b/app/src/main/res/drawable-xxhdpi/icon_page_video_a1.png
new file mode 100644
index 00000000..221c49a7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_page_video_a1.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_page_video_a2.png b/app/src/main/res/drawable-xxhdpi/icon_page_video_a2.png
new file mode 100644
index 00000000..17858f57
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_page_video_a2.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_page_video_a3.png b/app/src/main/res/drawable-xxhdpi/icon_page_video_a3.png
new file mode 100644
index 00000000..fdf21227
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_page_video_a3.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/record_select.png b/app/src/main/res/drawable-xxhdpi/record_select.png
new file mode 100644
index 00000000..d265c7bb
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/record_select.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/takephoto_select.png b/app/src/main/res/drawable-xxhdpi/takephoto_select.png
new file mode 100644
index 00000000..f7d72ed0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/takephoto_select.png differ
diff --git a/app/src/main/res/drawable/chk_icon_camera_open_close_xml.xml b/app/src/main/res/drawable/chk_icon_camera_open_close_xml.xml
index 1119bd24..e2596050 100644
--- a/app/src/main/res/drawable/chk_icon_camera_open_close_xml.xml
+++ b/app/src/main/res/drawable/chk_icon_camera_open_close_xml.xml
@@ -1,9 +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="@mipmap/icon_camera_on">
+ <item android:state_checked="true" android:drawable="@drawable/icon_camera_on">
</item>
- <item android:state_selected="true" android:drawable="@mipmap/icon_camera_on">
+ <item android:state_selected="true" android:drawable="@drawable/icon_camera_on">
</item>
- <item android:drawable="@mipmap/icon_camera_off">
+ <item android:drawable="@drawable/icon_camera_off">
</item>
</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/chk_icon_camera_record_or_takephoto_xml.xml b/app/src/main/res/drawable/chk_icon_camera_record_or_takephoto_xml.xml
index 7c7a5a79..dd46fcef 100644
--- a/app/src/main/res/drawable/chk_icon_camera_record_or_takephoto_xml.xml
+++ b/app/src/main/res/drawable/chk_icon_camera_record_or_takephoto_xml.xml
@@ -1,9 +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="@mipmap/record_select">
+ <item android:state_checked="true" android:drawable="@drawable/record_select">
</item>
- <item android:state_selected="true" android:drawable="@mipmap/record_select">
+ <item android:state_selected="true" android:drawable="@drawable/record_select">
</item>
- <item android:drawable="@mipmap/takephoto_select">
+ <item android:drawable="@drawable/takephoto_select">
</item>
</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/chk_icon_camera_start_stop_xml.xml b/app/src/main/res/drawable/chk_icon_camera_start_stop_xml.xml
index ca55bb7e..6517ebf0 100644
--- a/app/src/main/res/drawable/chk_icon_camera_start_stop_xml.xml
+++ b/app/src/main/res/drawable/chk_icon_camera_start_stop_xml.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_checked="true" android:state_enabled="true" android:drawable="@mipmap/icon_camera_start">
+ <item android:state_checked="true" android:state_enabled="true" android:drawable="@drawable/icon_camera_start">
</item>
- <item android:state_selected="true" android:state_enabled="true" android:drawable="@mipmap/icon_camera_start">
+ <item android:state_selected="true" android:state_enabled="true" android:drawable="@drawable/icon_camera_start">
</item>
- <item android:state_enabled="false" android:drawable="@mipmap/icon_camera_start_disable">
+ <item android:state_enabled="false" android:drawable="@drawable/icon_camera_start_disable">
</item>
- <item android:drawable="@mipmap/icon_camera_end">
+ <item android:drawable="@drawable/icon_camera_end">
</item>
</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_camera_close_xml.xml b/app/src/main/res/drawable/icon_camera_close_xml.xml
index 6bbcc538..26eaa484 100644
--- a/app/src/main/res/drawable/icon_camera_close_xml.xml
+++ b/app/src/main/res/drawable/icon_camera_close_xml.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@mipmap/icon_camera_close_press" android:state_focused="true"></item>
- <item android:drawable="@mipmap/icon_camera_close_press" android:state_pressed="true"></item>
- <item android:drawable="@mipmap/icon_camera_close_press" android:state_selected="true"></item>
- <item android:drawable="@mipmap/icon_camera_close_press" android:state_checked="true"></item>
- <item android:drawable="@mipmap/icon_camera_close_normal"></item>
+ <item android:drawable="@drawable/icon_camera_close_press" android:state_focused="true"></item>
+ <item android:drawable="@drawable/icon_camera_close_press" android:state_pressed="true"></item>
+ <item android:drawable="@drawable/icon_camera_close_press" android:state_selected="true"></item>
+ <item android:drawable="@drawable/icon_camera_close_press" android:state_checked="true"></item>
+ <item android:drawable="@drawable/icon_camera_close_normal"></item>
</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pop_camera_img.xml b/app/src/main/res/drawable/pop_camera_img.xml
index fb7e8b10..62f0bbe1 100644
--- a/app/src/main/res/drawable/pop_camera_img.xml
+++ b/app/src/main/res/drawable/pop_camera_img.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false">
- <item android:drawable="@mipmap/icon_page_video_a3" android:duration="1000" />
- <item android:drawable="@mipmap/icon_page_video_a0" android:duration="1000" />
- <item android:drawable="@mipmap/icon_page_video_a3" android:duration="1000" />
- <item android:drawable="@mipmap/icon_page_video_a0" android:duration="1000" />
+ <item android:drawable="@drawable/icon_page_video_a3" android:duration="1000" />
+ <item android:drawable="@drawable/icon_page_video_a0" android:duration="1000" />
+ <item android:drawable="@drawable/icon_page_video_a3" android:duration="1000" />
+ <item android:drawable="@drawable/icon_page_video_a0" android:duration="1000" />
</animation-list>
diff --git a/app/src/main/res/drawable/pop_camera_take_photo_img.xml b/app/src/main/res/drawable/pop_camera_take_photo_img.xml
index 5acd8ef8..ce4e7c02 100644
--- a/app/src/main/res/drawable/pop_camera_take_photo_img.xml
+++ b/app/src/main/res/drawable/pop_camera_take_photo_img.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false">
- <item android:drawable="@mipmap/icon_page_take_photo_a3" android:duration="1000" />
- <item android:drawable="@mipmap/icon_page_take_photo_a3" android:duration="1000" />
- <item android:drawable="@mipmap/icon_page_take_photo_a3" android:duration="1000" />
- <item android:drawable="@mipmap/icon_page_take_photo_a0" android:duration="1000" />
+ <item android:drawable="@drawable/icon_page_take_photo_a3" android:duration="1000" />
+ <item android:drawable="@drawable/icon_page_take_photo_a3" android:duration="1000" />
+ <item android:drawable="@drawable/icon_page_take_photo_a3" android:duration="1000" />
+ <item android:drawable="@drawable/icon_page_take_photo_a0" android:duration="1000" />
</animation-list>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 34a0cb52..40393b4f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -99,7 +99,7 @@
android:layout_marginLeft="160dp"
android:layout_marginTop="20dp"
android:onClick="@{()->mainActivity.openCamera()}"
- android:src="@mipmap/icon_page_video_a1"
+ android:src="@drawable/icon_page_video_a1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/connect_out_camera.xml b/app/src/main/res/layout/connect_out_camera.xml
index 8c0f6134..f1443d8d 100644
--- a/app/src/main/res/layout/connect_out_camera.xml
+++ b/app/src/main/res/layout/connect_out_camera.xml
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/fl_layout"
- android:background="@color/white"
+ android:background="@android:color/white"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="15dp"
@@ -43,7 +43,7 @@
android:layout_centerVertical="true"
android:text="默认外设相机拍照"
android:textColor="@android:color/black"
- android:textSize="15sp" />
+ android:textSize="@dimen/default_font_size" />
<CheckBox
android:id="@+id/select_camera"
@@ -81,7 +81,7 @@
android:layout_marginBottom="1dp"
android:padding="@dimen/ten"
android:text="一键连接"
- android:textSize="@dimen/card_title_font_2size" />
+ android:textSize="@dimen/default_font_size" />
</LinearLayout>
<FrameLayout
@@ -92,35 +92,23 @@
android:background="@color/bg_gray2">
- <CheckBox
- android:id="@+id/startorendtakepicture"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|center_horizontal"
- android:button="@drawable/chk_icon_camera_start_stop_xml"
- android:checked="true"
- android:enabled="false" />
+ <SurfaceView
+ android:id="@+id/video"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerInParent="true"
+ android:background="@color/bg_gray2"
+ android:fitsSystemWindows="true"
+ android:visibility="gone" />
- <CheckBox
- android:id="@+id/takephoto_or_record"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right|bottom"
- android:layout_margin="10dp"
- android:button="@drawable/chk_icon_camera_record_or_takephoto_xml"
- android:checked="true"
- android:paddingLeft="@dimen/five"
- android:text="录像"
- android:textColor="@color/white" />
-
<ImageView
android:id="@+id/video_defalut"
android:layout_width="148.5dp"
android:layout_height="@dimen/camear_dialog_iv_hight"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/camear_dialog_iv_margin_top"
- android:src="@mipmap/icon_camera_img" />
+ android:src="@drawable/icon_camera_img" />
<LinearLayout
android:layout_width="fill_parent"
@@ -134,7 +122,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/five"
- android:src="@mipmap/icon_camera_time" />
+ android:src="@drawable/icon_camera_time" />
<TextView
android:layout_width="wrap_content"
@@ -147,14 +135,26 @@
</LinearLayout>
- <SurfaceView
- android:id="@+id/video"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_centerInParent="true"
- android:background="@color/bg_gray2"
- android:fitsSystemWindows="true"
- android:visibility="gone" />
+ <CheckBox
+ android:id="@+id/startorendtakepicture"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|center_horizontal"
+ android:button="@drawable/chk_icon_camera_start_stop_xml"
+ android:checked="true"
+ android:enabled="false" />
+
+ <CheckBox
+ android:id="@+id/takephoto_or_record"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right|bottom"
+ android:layout_margin="10dp"
+ android:paddingLeft="@dimen/five"
+ android:textColor="@color/white"
+ android:text="录像"
+ android:button="@drawable/chk_icon_camera_record_or_takephoto_xml"
+ android:checked="true" />
</FrameLayout>
</RelativeLayout>
diff --git a/collect-library/src/main/AndroidManifest.xml b/collect-library/src/main/AndroidManifest.xml
index a899eb5f..0cc633b5 100644
--- a/collect-library/src/main/AndroidManifest.xml
+++ b/collect-library/src/main/AndroidManifest.xml
@@ -8,16 +8,29 @@
<data android:mimeType="*/*"/>
</intent>
</queries>
- <!-- AK鉴权 -->
- <meta-data
- android:name="com.baidu.lbsapi.API_KEY"
- android:value="IxQi4mZGTlfv6Z9M2GRdqn4KKRbOATUU" />
+
+
<!--<meta-data
android:name="com.baidu.lbsapi.API_KEY"
android:value="IxQi4mZGTlfv6Z9M2GRdqn4KKRbOATUU" />--><!--BMnHEAZ8Ypq44GOBf4UqENgvCmncfFU6-->
<application
android:allowBackup="true"
android:networkSecurityConfig="@xml/network_security_config">
+
+ <!-- AK鉴权 -->
+ <meta-data
+ android:name="com.baidu.lbsapi.API_KEY"
+ android:value="BMnHEAZ8Ypq44GOBf4UqENgvCmncfFU6" />
+
+ <service
+ android:name="com.baidu.location.f"
+ android:enabled="true"
+ android:process=":remote">
+ <intent-filter>
+ <action android:name="com.baidu.location.service_v2.2" />
+ </intent-filter>
+ </service>
+
</application>
</manifest>
\ No newline at end of file