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

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>