From 97f4db7efea9fb7cc0a89aaef11563a6f08b85a2 Mon Sep 17 00:00:00 2001
From: md <zmd1026@163.com>
Date: Thu, 26 Aug 2021 19:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B98.25=E5=8F=B7=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   8 +-
 app/src/main/AndroidManifest.xml              |   6 +-
 .../outdoor/activity/LoginActivity.java       |   2 +-
 .../outdoor/fragment/GatheringFragment.java   |  18 +-
 .../outdoor/fragment/PoiVideoFragment.java    |   2 +-
 .../fragment/UserAttestationFragment.java     |  17 +-
 app/src/main/res/layout/find_fragment.xml     | 197 ++++++++++--------
 .../main/res/layout/fragment_gather_get.xml   |   4 +-
 .../main/res/layout/poi_video_fragment.xml    |  10 +-
 .../res/layout/user_attestation_fragment.xml  |   1 +
 app/src/main/res/values/colors.xml            |   1 +
 11 files changed, 148 insertions(+), 118 deletions(-)

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 @@
         <activity android:name=".activity.LinkActivity" />
         <activity android:name=".activity.RegardMapActivity" />
         <activity android:name=".activity.StatementActivity" />
-        <activity android:name=".activity.PicturesActivity"
+        <activity
+            android:name=".activity.PicturesActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|navigation"
-            android:launchMode="singleTop"/>
+            android:launchMode="singleTop" />
         <activity
             android:name=".activity.PictureActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|navigation"
@@ -101,6 +102,7 @@
         <activity
             android:name=".activity.GuidanceActivity"
             android:screenOrientation="portrait" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.navinfo.outdoor.fileprovider"
diff --git a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java
index 00a33f8..e644661 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java
@@ -131,7 +131,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                     return;
                 }
                 if (!cbStatement.isChecked()){
-                    Toast.makeText(this, "请先同意免责协议", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请先同意免责声明", Toast.LENGTH_SHORT).show();
                     return;
                 }else {
                     initLogIn(name, paw);
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
index 07f6b55..c162e70 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
@@ -104,7 +104,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
         }
         if (Constant.ID_NUMBER!=null){
             etBankNum.setText(Constant.ID_NUMBER);
-            btnBank.setText("已绑定");
+            btnBank.setText("重新绑定");
         }
     }
 
@@ -244,17 +244,17 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
             Constant.FILE_PATH = absolutePath;
             gatheringCamera.setTag(absolutePath);
             //银行卡识别
-            String bankCard = BankCard.bankCard();
-            if (bankCard!=null&&!bankCard.equals("")){
-                BankCardBean bankCardBean = new Gson().fromJson(bankCard, BankCardBean.class);
-                if (bankCardBean==null){
-                    Toast.makeText(getContext(), "请手动添加银行卡号", Toast.LENGTH_SHORT).show();
-                }else {
+            BankCardBean bankCardBean = new Gson().fromJson(BankCard.bankCard(), BankCardBean.class);
+            if (bankCardBean==null){
+                Toast.makeText(getContext(), "请手动添加银行卡号", Toast.LENGTH_SHORT).show();
+            }else {
+                if (bankCardBean.getResult().getBank_card_number()!=null){
                     String bank_card_number = bankCardBean.getResult().getBank_card_number();
                     etBankNum.setText(bank_card_number);
+                }else {
+                    Toast.makeText(getActivity(), "请拍银行卡照片", Toast.LENGTH_SHORT).show();
                 }
-            }else {
-                Toast.makeText(getContext(), "请手动添加银行卡号", Toast.LENGTH_SHORT).show();
+
             }
 
 
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
index a2b4aef..bbf7b61 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
@@ -195,7 +195,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
             @Override
             public boolean onLongClick(View v) {
                 DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
-                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
+                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         List<File> 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/rl_find"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#1BA5F1"
+        android:background="@color/colorPrimaryBlue"
+        android:orientation="horizontal"
         android:paddingTop="@dimen/top_pind_sp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
+
         <TextView
             android:id="@+id/tv_find"
             android:layout_width="wrap_content"
-            style="@style/text_style_toolbar_title"
+            android:layout_height="45dp"
+            android:layout_marginLeft="15dp"
+            android:layout_toRightOf="@id/iv_find_task"
+            android:gravity="center"
+            android:text="发现"
             android:textColor="#fff"
-            android:text="发现" />
-    </RelativeLayout>
+            android:textSize="20sp"
+            android:textStyle="bold" />
+    </LinearLayout>
 
     <androidx.cardview.widget.CardView
         android:id="@+id/cardView"
         android:layout_width="match_parent"
         android:layout_height="250dp"
+        app:cardElevation="0dp"
         app:cardPreventCornerOverlap="false"
         app:cardUseCompatPadding="false"
-        app:cardElevation="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/rl_find">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            >
+            android:orientation="vertical">
+
             <LinearLayout
                 android:id="@+id/linear1"
                 android:layout_width="match_parent"
@@ -54,13 +62,15 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="15dp"
-                    android:textSize="18sp"
-                    android:text="最新公告" />
+                    android:text="最新公告"
+                    android:textSize="18sp" />
             </LinearLayout>
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#E4E4E4"/>
+                android:background="#E4E4E4" />
+
             <LinearLayout
                 android:id="@+id/linear2"
                 android:layout_width="match_parent"
@@ -107,94 +117,97 @@
         android:layout_width="match_parent"
         android:layout_height="400dp"
         android:layout_marginTop="20dp"
+        android:layout_marginBottom="50dp"
+        app:cardElevation="0dp"
         app:cardPreventCornerOverlap="false"
         app:cardUseCompatPadding="false"
-        app:cardElevation="0dp"
-        android:layout_marginBottom="50dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/cardView">
-     <LinearLayout
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
-         android:orientation="vertical"
-         >
-         <LinearLayout
-             android:id="@+id/linear3"
-             android:layout_width="match_parent"
-             android:layout_height="40dp"
-             android:layout_marginTop="15dp"
-             android:orientation="horizontal">
 
-             <ImageView
-                 android:layout_width="5dp"
-                 android:layout_height="18dp"
-                 android:layout_gravity="center_vertical"
-                 android:layout_marginLeft="15dp"
-                 android:background="#CCCBCB" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-             <TextView
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_gravity="center_vertical"
-                 android:layout_marginLeft="15dp"
-                 android:textSize="18sp"
-                 android:text="帮助中心" />
-         </LinearLayout>
+            <LinearLayout
+                android:id="@+id/linear3"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginTop="15dp"
+                android:orientation="horizontal">
 
-         <View
-             android:layout_width="match_parent"
-             android:layout_height="1dp"
-             android:background="#E4E4E4" />
-         <LinearLayout
-             android:id="@+id/linear4"
-             android:layout_width="match_parent"
-             android:layout_height="120dp"
-             android:orientation="horizontal">
-             <LinearLayout
-                 android:id="@+id/linear_task_explain"
-                 android:layout_width="0dp"
-                 android:layout_weight="1"
-                 android:layout_height="match_parent"
-                 android:orientation="vertical"
-                 android:gravity="center">
-                 <ImageView
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:scaleType="centerInside"
-                     android:src="@drawable/icon_task_specification"
-                     />
-                 <TextView
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:text="任务说明"
-                     android:textSize="12sp"
-                     />
-             </LinearLayout>
-             <LinearLayout
-                 android:id="@+id/linear_end"
-                 android:layout_width="0dp"
-                 android:layout_weight="1"
-                 android:layout_height="match_parent"
-                 android:orientation="vertical"
-                 android:gravity="center">
-                 <ImageView
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:scaleType="centerInside"
-                     android:src="@drawable/icon_capacity_evaluation"
-                     />
-                 <TextView
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:text="能力测评"
-                     android:textSize="12sp"
-                     />
-             </LinearLayout>
-         </LinearLayout>
-     </LinearLayout>
+                <ImageView
+                    android:layout_width="5dp"
+                    android:layout_height="18dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="15dp"
+                    android:background="#CCCBCB" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="15dp"
+                    android:text="帮助中心"
+                    android:textSize="18sp" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#E4E4E4" />
+
+            <LinearLayout
+                android:id="@+id/linear4"
+                android:layout_width="match_parent"
+                android:layout_height="120dp"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/linear_task_explain"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/icon_task_specification" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="任务说明"
+                        android:textSize="12sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/linear_end"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/icon_capacity_evaluation" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="能力测评"
+                        android:textSize="12sp" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
     </androidx.cardview.widget.CardView>
 
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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" />
 
+
                     <TextView
                         android:id="@+id/tv_pictures"
                         style="@style/user_style"
@@ -174,6 +175,13 @@
                         android:text="拍照"
                         android:textColor="@color/white"
                         android:textSize="15sp" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="长按图片或者录像可删除"
+                        android:textSize="16sp"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="5dp"/>
 
                 </LinearLayout>
 
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" />
     </LinearLayout>
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 @@
     <color name="colorPrimaryBlue">#03A9F4</color>
     <color name="colormap">#CBC2C5C6</color>
     <color name="colorBlue">#2196F3</color>
+    <color name="blue">#8181F7</color>
     <color name="colorAccent">#03DAC5</color>
     <color name="colorBack">#000000</color>
     <color name="colorGrey">#FAFAFA</color>