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

1。修改了超时 2.修改拍照页面的bug 3.修改登录页面的逻辑，修改retfit_token 4.token 登录已过期，是否重新登录 5.添加了已领取（网络本地）列表 6.退出拍摄界面（点击退出）弹窗显示 照片自动保存 7.作业列表的返回 弹窗显示。

Browse Source
This commit is contained in:
wangdongsheng
2021-11-09 17:10:37 +08:00
parent 6267161ec6
commit 873e671de9
61 changed files with 2297 additions and 1419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/res/layout/activity_pictures.xml
View File

@@ -59,15 +59,24 @@
app:layout_constraintWidth_default="percent"
app:layout_constraintWidth_percent="0.4" />
<TextView
android:id="@+id/tv_title"
android:textColor="@color/white"
android:layout_marginTop="25dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_zoom_add"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@mipmap/zoom_add"
android:visibility="gone"
android:layout_marginEnd="25dp"
app:layout_constraintBottom_toTopOf="@+id/btn_stop_picture"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/btn_switch"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
@@ -104,6 +113,7 @@
<Button
android:id="@+id/btn_switch"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"

24
app/src/main/res/layout/capacity_item.xml
View File

@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="100dp">
android:background="?android:attr/selectableItemBackground"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_tas_capacity"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="30dp"
android:layout_marginBottom="30dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@@ -18,26 +22,27 @@
android:id="@+id/tas_capacity_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:text="111111111"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/iv_tas_capacity"
app:layout_constraintLeft_toRightOf="@id/iv_tas_capacity"
app:layout_constraintTop_toTopOf="@id/iv_tas_capacity" />
app:layout_constraintTop_toTopOf="@id/iv_tas_capacity"
/>
<LinearLayout
android:id="@+id/ll_results"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/iv_tas_capacity"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/tas_capacity_title">
app:layout_constraintTop_toTopOf="@+id/iv_tas_capacity">
<TextView
android:id="@+id/tv_results"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:text="成绩："
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
@@ -47,7 +52,7 @@
android:id="@+id/tv_capacity_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:text="通过"
app:layout_constraintBottom_toBottomOf="@id/tv_results"
app:layout_constraintLeft_toRightOf="@id/tv_results"
@@ -57,14 +62,13 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:layout_marginEnd="5dp"
android:text="去测评>"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_results" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="@color/colormap"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/contact_fragment.xml
View File

@@ -72,7 +72,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:gravity="center"
android:orientation="horizontal">
<TextView

4
app/src/main/res/layout/event_prefecture_item.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -39,7 +39,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:layout_marginTop="15dp"
android:background="@color/colormap"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_capacity_eva_web.xml
View File

@@ -28,7 +28,7 @@
android:layout_width="wrap_content"
style="@style/text_style_toolbar_title"
android:layout_toRightOf="@id/iv_find_task"
android:text="活动专区" />
android:text="试题测试" />
</LinearLayout>
<androidx.core.widget.NestedScrollView

2
app/src/main/res/layout/fragment_gather_get.xml
View File

@@ -23,6 +23,8 @@
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:text="众包录像 测试3"
android:ellipsize="end"
android:lines="2"
android:textColor="#333"
android:textSize="18sp"
app:layout_constraintLeft_toLeftOf="parent"

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

@@ -56,7 +56,7 @@
android:id="@+id/audit_process"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:text="0"
android:textSize="12sp" />
<TextView
@@ -70,7 +70,7 @@
android:id="@+id/audit_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:text="0"
android:textSize="12sp" />
<TextView
@@ -84,7 +84,7 @@
android:id="@+id/audit_not_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="18"
android:text="0"
android:textSize="12sp" />
</LinearLayout>
@@ -157,7 +157,7 @@
android:id="@+id/poiVideo_audit_process"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:text="0"
android:textSize="12sp" />
<TextView
@@ -171,7 +171,7 @@
android:id="@+id/poiVideo_audit_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:text="0"
android:textSize="12sp" />
<TextView
@@ -185,7 +185,7 @@
android:id="@+id/poiVideo_audit_process_audit_not_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="18"
android:text="0"
android:textSize="12sp" />
</LinearLayout>
@@ -257,7 +257,7 @@
android:id="@+id/road_audit_process"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:text="0"
android:textSize="12sp" />
<TextView
@@ -271,7 +271,7 @@
android:id="@+id/road_audit_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:text="0"
android:textSize="12sp" />
<TextView
@@ -285,7 +285,7 @@
android:id="@+id/road_audit_not_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="18"
android:text="0"
android:textSize="12sp" />
</LinearLayout>
@@ -352,7 +352,7 @@
android:id="@+id/charging_audit_process"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:text="0"
android:textSize="12sp" />
<TextView
@@ -366,7 +366,7 @@
android:id="@+id/charging_audit_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:text="0"
android:textSize="12sp" />
<TextView
@@ -380,7 +380,7 @@
android:id="@+id/charging_audit_not_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="18"
android:text="0"
android:textSize="12sp" />
</LinearLayout>
@@ -449,7 +449,7 @@
android:id="@+id/other_audit_process"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:text="0"
android:textSize="12sp" />
<TextView
@@ -463,7 +463,7 @@
android:id="@+id/other_audit_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:text="0"
android:textSize="12sp" />
<TextView
@@ -477,7 +477,7 @@
android:id="@+id/other_audit_not_through"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="18"
android:text="0"
android:textSize="12sp" />
</LinearLayout>

4
app/src/main/res/layout/fragment_other.xml
View File

@@ -12,7 +12,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
</include>
<androidx.core.widget.NestedScrollView
android:id="@+id/nested_scroll_view"
@@ -361,8 +360,6 @@
android:paddingBottom="30dp"
android:textColor="@color/test_color_selector"
android:textSize="15sp"
/>
</LinearLayout>
@@ -400,7 +397,6 @@
android:text="上传" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>

47
app/src/main/res/layout/tas_explain_item.xml
View File

@@ -1,36 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_height="60dp">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:id="@+id/iv_tas_explain"
android:layout_marginLeft="10dp"
android:scaleType="fitCenter"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_tas_explain"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="10dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tas_explain_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="111111111"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="@id/iv_tas_explain"
app:layout_constraintBottom_toBottomOf="@id/iv_tas_explain"
app:layout_constraintLeft_toRightOf="@id/iv_tas_explain"
android:layout_marginLeft="10dp"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
app:layout_constraintBottom_toBottomOf="parent"
android:background="#C0BFBF"/>
app:layout_constraintTop_toTopOf="@id/iv_tas_explain" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#C0BFBF"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>