diff --git a/app/build.gradle b/app/build.gradle
index 177d592..1307bc8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 29
buildToolsVersion '29.0.2'
- // ndkVersion '23.0.7123448'
+ ndkVersion '23.0.7123448'
defaultConfig {
applicationId "com.navinfo.outdoor"
@@ -33,9 +33,9 @@ android {
}
}
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
}
}
//efs {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 115b57e..98f8bd1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,9 +50,10 @@
-
+ android:launchMode="singleTop" />
+
videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
index 796bcba..1ca29ab 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
@@ -144,6 +144,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
etAttestationName.setEnabled(false);
etNamePhone.setEnabled(false);
btnAttestation.setEnabled(false);
+ useCamera.setEnabled(false);
}
@@ -349,19 +350,23 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
String absolutePath = file.getAbsolutePath();
Constant.FILE_PATH = absolutePath;
useCamera.setTag(absolutePath);
+
//身份证识别
- String icarus = IdCard.icarus();
- if (icarus!=null&&!icarus.equals("")){
- IdCardNumberBean idCardNumberBean = new Gson().fromJson(icarus, IdCardNumberBean.class);
+ String idcard = IdCard.icarus();
+ if (idcard!=null){
+ IdCardNumberBean idCardNumberBean = new Gson().fromJson(idcard, IdCardNumberBean.class);
if (idCardNumberBean ==null){
Toast.makeText(getActivity(), "请手动添加身份证号", Toast.LENGTH_SHORT).show();
}else {
- String words = idCardNumberBean.getWords_result().get公民身份号码().getWords();
- etNamePhone.setText(words);
+ if (idCardNumberBean.getWords_result().get公民身份号码()!=null){
+ String words = idCardNumberBean.getWords_result().get公民身份号码().getWords();
+ etNamePhone.setText(words);
+ }else {
+ Toast.makeText(getActivity(), "请拍身份证照片", Toast.LENGTH_SHORT).show();
+ }
}
}else {
Toast.makeText(getActivity(), "请手动添加身份证号", Toast.LENGTH_SHORT).show();
-
}
}
diff --git a/app/src/main/res/layout/find_fragment.xml b/app/src/main/res/layout/find_fragment.xml
index 81a8ff7..7e5e871 100644
--- a/app/src/main/res/layout/find_fragment.xml
+++ b/app/src/main/res/layout/find_fragment.xml
@@ -1,40 +1,48 @@
-
-
+
-
+ android:textSize="20sp"
+ android:textStyle="bold" />
+
+
+ android:orientation="vertical">
+
+ android:text="最新公告"
+ android:textSize="18sp" />
+
+ android:background="#E4E4E4" />
+
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_gather_get.xml b/app/src/main/res/layout/fragment_gather_get.xml
index d380459..9535bc4 100644
--- a/app/src/main/res/layout/fragment_gather_get.xml
+++ b/app/src/main/res/layout/fragment_gather_get.xml
@@ -11,8 +11,8 @@
android:layout_width="25dp"
android:layout_height="25dp"
android:padding="5dp"
- android:layout_marginEnd="10dp"
- android:layout_marginTop="5dp"
+ android:layout_marginEnd="20dp"
+ android:layout_marginTop="10dp"
android:background="@drawable/icon_delete"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/poi_video_fragment.xml b/app/src/main/res/layout/poi_video_fragment.xml
index c708456..1b047fd 100644
--- a/app/src/main/res/layout/poi_video_fragment.xml
+++ b/app/src/main/res/layout/poi_video_fragment.xml
@@ -160,10 +160,11 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:gravity="center"
- android:text="录像"
+ android:text="点击录像"
android:textColor="@color/white"
android:textSize="15sp" />
+
+
diff --git a/app/src/main/res/layout/user_attestation_fragment.xml b/app/src/main/res/layout/user_attestation_fragment.xml
index b667701..9bd60ac 100644
--- a/app/src/main/res/layout/user_attestation_fragment.xml
+++ b/app/src/main/res/layout/user_attestation_fragment.xml
@@ -71,6 +71,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp"
+ android:visibility="gone"
android:text="2.银行卡户主姓名必须与实名认证姓名一致"
android:textColor="#FF9800" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index be8ea3e..8897b6a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,6 +5,7 @@
#03A9F4
#CBC2C5C6
#2196F3
+ #8181F7
#03DAC5
#000000
#FAFAFA