update:2020.10.19

fix:兼容Android10,获取sn失败
add:
This commit is contained in:
2020-10-19 18:42:52 +08:00
parent 9e1f50f381
commit 08d8c0bef4
24 changed files with 351 additions and 103 deletions

View File

@@ -73,7 +73,7 @@
android:shape="rectangle"
android:useLevel="false">
<!--实心 -->
<solid android:color="@color/red" />
<solid android:color="@color/blue" />
<corners android:radius="25dp" />
<size android:width="32dp"
android:height="32dp"/>

View File

@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
@@ -15,8 +16,8 @@
android:id="@+id/search_iv_back"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="20dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="20dp"
android:adjustViewBounds="true"
android:onClick="finish"
android:scaleType="centerInside"
@@ -40,13 +41,14 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/white"
android:layout_weight="1">
android:layout_weight="1"
android:background="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:descendantFocusability="blocksDescendants"
android:orientation="vertical">
<LinearLayout
@@ -104,15 +106,22 @@
</LinearLayout>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/detail_rv_image"
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:overScrollMode="never"
android:scrollbars="none">
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/detail_rv_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:background="@color/white"
android:overScrollMode="never" />
</HorizontalScrollView>
<TextView
android:layout_width="match_parent"

View File

@@ -43,11 +43,32 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/detail_rv"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:listitem="@layout/item_app" />
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/detail_rv"
android:overScrollMode="never"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:listitem="@layout/item_app" />
<ImageView
android:id="@+id/imageView"
android:layout_width="300dp"
android:layout_height="300dp"
android:layout_centerInParent="true"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/icon_nodata"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>

View File

@@ -104,6 +104,7 @@
<androidx.viewpager.widget.ViewPager
android:id="@+id/main_view_pager"
android:layout_width="match_parent"
android:overScrollMode="never"
android:layout_height="0dp"
android:layout_weight="1" />

View File

@@ -40,21 +40,16 @@
</LinearLayout>
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/featured_refresh_layout"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:background="@color/white"
app:layout_constraintTop_toBottomOf="@+id/linearLayout3">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="0dp"
android:overScrollMode="never"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linearLayout3"
tools:listitem="@layout/item_app" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<com.scwang.smartrefresh.layout.SmartRefreshLayout
@@ -32,7 +33,22 @@
android:id="@+id/featured_rv_result"
android:nestedScrollingEnabled="false"
android:layout_width="match_parent"
android:overScrollMode="never"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/imageView"
android:layout_width="300dp"
android:layout_height="300dp"
android:layout_centerInParent="true"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/icon_nodata"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</RelativeLayout>
</LinearLayout>
</ScrollView>

View File

@@ -5,8 +5,15 @@
android:background="@color/white"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/kind_rv_kind"
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/featured_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/kind_rv_kind"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>

View File

@@ -158,6 +158,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/manage_rv_local"
android:overScrollMode="never"
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="match_parent" />

View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@drawable/ll_selector"
@@ -10,6 +11,8 @@
android:layout_height="0dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_weight="1"
android:orientation="horizontal">

View File

@@ -12,4 +12,5 @@
<color name="download">#ffffff</color>
<color name="backgroundcolor">#ffffff</color>
<color name="red">#d64743</color>
<color name="blue">#00a0e9</color>
</resources>