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

1.添加推送逻辑，修改删除照片，修改友盟上的bug.

Browse Source
This commit is contained in:
wangdongsheng
2021-12-03 11:05:37 +08:00
parent bfe2f6b985
commit 8ff0e92c8a
59 changed files with 859 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
app/src/main/res/layout/fragment_has_submit.xml
View File

@@ -12,7 +12,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
app:layout_constraintTop_toTopOf="parent">
<ImageView
@@ -20,12 +19,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp"
android:background="@drawable/marker_poi"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_poi"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv_poi"
@@ -35,7 +34,8 @@
android:text="POI任务列表"
android:textColor="@color/black"
app:layout_constraintLeft_toRightOf="@id/iv_poi"
app:layout_constraintTop_toTopOf="@id/iv_poi" />
app:layout_constraintTop_toTopOf="@id/iv_poi"
tools:ignore="HardcodedText" />
<LinearLayout
android:layout_width="wrap_content"
@@ -50,13 +50,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核中:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
android:id="@+id/audit_process"
android:id="@+id/poi_audit_process"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -64,13 +66,15 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
android:id="@+id/audit_through"
android:id="@+id/poi_audit_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -78,13 +82,15 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核未通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
android:id="@+id/audit_not_through"
android:id="@+id/poi_audit_not_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
</LinearLayout>
@@ -95,7 +101,8 @@
android:src="@drawable/icon_arrow_right"
app:layout_constraintBottom_toBottomOf="@id/iv_poi"
app:layout_constraintRight_toRightOf="@id/has_submit_view"
app:layout_constraintTop_toTopOf="@id/iv_poi" />
app:layout_constraintTop_toTopOf="@id/iv_poi"
tools:ignore="ContentDescription" />
<View
android:id="@+id/has_submit_view"
@@ -109,12 +116,12 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_poi" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_poiVideo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
app:layout_constraintTop_toTopOf="parent">
<ImageView
@@ -122,11 +129,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp"
android:background="@drawable/marker_poi_video"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv_poiVideo"
@@ -136,7 +143,8 @@
android:text="POI录像任务列表"
android:textColor="@color/black"
app:layout_constraintLeft_toRightOf="@id/iv_poiVideo"
app:layout_constraintTop_toTopOf="@id/iv_poiVideo" />
app:layout_constraintTop_toTopOf="@id/iv_poiVideo"
tools:ignore="HardcodedText" />
<LinearLayout
android:layout_width="wrap_content"
@@ -151,6 +159,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核中:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -158,6 +167,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -165,6 +175,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -172,6 +183,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -179,6 +191,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核未通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -186,6 +199,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
</LinearLayout>
@@ -196,7 +210,8 @@
android:src="@drawable/icon_arrow_right"
app:layout_constraintBottom_toBottomOf="@id/iv_poiVideo"
app:layout_constraintRight_toRightOf="@id/poiVideo_has_submit_view"
app:layout_constraintTop_toTopOf="@id/iv_poiVideo" />
app:layout_constraintTop_toTopOf="@id/iv_poiVideo"
tools:ignore="ContentDescription" />
<View
android:id="@+id/poiVideo_has_submit_view"
@@ -223,10 +238,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/marker_road"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/view4"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
/>
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv_road"
@@ -236,7 +251,8 @@
android:text="道路任务列表"
android:textColor="@color/black"
app:layout_constraintLeft_toRightOf="@id/iv_road"
app:layout_constraintTop_toTopOf="@id/iv_road" />
app:layout_constraintTop_toTopOf="@id/iv_road"
tools:ignore="HardcodedText" />
<LinearLayout
android:layout_width="wrap_content"
@@ -250,6 +266,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="审核中:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -258,6 +275,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -265,6 +283,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -272,6 +291,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -279,6 +299,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核未通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -286,6 +307,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
</LinearLayout>
@@ -296,7 +318,8 @@
android:src="@drawable/icon_arrow_right"
app:layout_constraintBottom_toBottomOf="@id/iv_road"
app:layout_constraintRight_toRightOf="@id/view4"
app:layout_constraintTop_toTopOf="@id/iv_road" />
app:layout_constraintTop_toTopOf="@id/iv_road"
tools:ignore="ContentDescription" />
<View
android:id="@+id/view4"
@@ -312,8 +335,7 @@
android:id="@+id/cl_charging"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
>
android:layout_marginStart="20dp">
<ImageView
android:id="@+id/iv_charging"
@@ -322,7 +344,8 @@
android:background="@drawable/marker_charge"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/view5"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv_charging"
@@ -332,7 +355,8 @@
android:text="充电站任务列表"
android:textColor="@color/black"
app:layout_constraintLeft_toRightOf="@id/iv_charging"
app:layout_constraintTop_toTopOf="@id/iv_charging" />
app:layout_constraintTop_toTopOf="@id/iv_charging"
tools:ignore="HardcodedText" />
<LinearLayout
android:layout_width="wrap_content"
@@ -346,6 +370,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核中:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -353,6 +378,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -360,6 +386,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -367,6 +394,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -374,6 +402,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核未通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -381,6 +410,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
</LinearLayout>
@@ -391,7 +421,8 @@
android:src="@drawable/icon_arrow_right"
app:layout_constraintBottom_toBottomOf="@id/iv_charging"
app:layout_constraintRight_toRightOf="@id/view5"
app:layout_constraintTop_toTopOf="@id/iv_charging" />
app:layout_constraintTop_toTopOf="@id/iv_charging"
tools:ignore="ContentDescription" />
<View
android:id="@+id/view5"
@@ -417,8 +448,8 @@
android:background="@drawable/marker_other"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/other_audit_view"
app:layout_constraintTop_toTopOf="parent"
/>
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv_other"
@@ -428,8 +459,9 @@
android:layout_marginEnd="245dp"
android:text="其他任务列表"
android:textColor="@color/black"
app:layout_constraintLeft_toRightOf="@+id/iv_other"
app:layout_constraintTop_toTopOf="@id/iv_other" />
app:layout_constraintLeft_toRightOf="@+id/iv_other"
app:layout_constraintTop_toTopOf="@id/iv_other"
tools:ignore="HardcodedText" />
<LinearLayout
android:layout_width="wrap_content"
@@ -443,6 +475,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核中:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -450,6 +483,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -457,6 +491,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -464,6 +499,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -471,6 +507,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="审核未通过:"
android:textColor="#333"
android:textSize="12sp" />
<TextView
@@ -478,6 +515,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#333"
android:textSize="12sp" />
</LinearLayout>
@@ -488,7 +526,8 @@
android:src="@drawable/icon_arrow_right"
app:layout_constraintBottom_toBottomOf="@id/iv_other"
app:layout_constraintRight_toRightOf="@id/other_audit_view"
app:layout_constraintTop_toTopOf="@id/iv_other" />
app:layout_constraintTop_toTopOf="@id/iv_other"
tools:ignore="ContentDescription" />
<View
android:id="@+id/other_audit_view"