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

Merge branch 'master' of C:\Users\wds81\StudioProjects\NavinfoOutDoorDataCollect with conflicts.

Browse Source
This commit is contained in:
wds
2021-05-28 18:48:31 +08:00
parent e5d85ac72f
commit 3ff0d534b8
22 changed files with 411 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/res/layout/activity_image_show.xml Normal file
View File

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/full_image_root"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#F4EEEE" >
<androidx.viewpager.widget.ViewPager
android:id="@+id/image_pager"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
<ImageView
android:id="@+id/download"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="15.0dip"
android:layout_marginRight="15.0dip"
android:src="@drawable/ic_baseline_arrow_back" />
<TextView
android:id="@+id/page_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/download"
android:layout_marginLeft="15.0dip"
android:textColor="#ffeeeeee"
android:textSize="12.0sp" />
</RelativeLayout>

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

@@ -2,8 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/rl_web"
@@ -18,7 +17,6 @@
android:layout_height="45dp"
android:src="@drawable/ic_baseline_arrow"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp" />
<TextView
@@ -29,23 +27,17 @@
android:layout_toRightOf="@id/iv_icon"
android:textColor="#fff" />
</RelativeLayout>
<com.example.myapplication.util.CustomScrollView
<WebView
android:id="@+id/news_webView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- <com.example.myapplication.util.CustomScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<WebView
android:id="@+id/news_webView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="26dp" />
android:orientation="vertical" >
</LinearLayout>
</com.example.myapplication.util.CustomScrollView>
</com.example.myapplication.util.CustomScrollView>-->
</LinearLayout>

14
app/src/main/res/layout/details_imageshow_item.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/full_image_root"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#F8F7F7" >
<ImageView
android:id="@+id/full_image"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:scaleType="fitCenter" />
</RelativeLayout>

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

@@ -79,7 +79,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:background="@drawable/icon_task_prefecture" />
android:scaleType="centerInside"
android:src="@drawable/icon_task_prefecture" />
</LinearLayout>
<LinearLayout
@@ -94,7 +95,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:background="@drawable/icon_event_prefecture" />
android:scaleType="centerInside"
android:src="@drawable/icon_event_prefecture" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
@@ -159,7 +161,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_task_specification"
android:scaleType="centerInside"
android:src="@drawable/icon_task_specification"
/>
<TextView
android:layout_width="wrap_content"
@@ -178,7 +181,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_capacity_evaluation"
android:scaleType="centerInside"
android:src="@drawable/icon_capacity_evaluation"
/>
<TextView
android:layout_width="wrap_content"

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

@@ -7,7 +7,7 @@
android:id="@+id/rl_find"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#fff"
android:background="#1BA5F1"
android:paddingTop="@dimen/top_pind_sp"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
@@ -31,7 +31,7 @@
android:layout_toRightOf="@id/iv_find_task"
android:gravity="center"
android:text="任务说明"
android:textColor="#000"
android:textColor="#fff"
android:textSize="17sp"
android:textStyle="bold" />
</LinearLayout>