tt/UIUIPadAppstore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.6.1

Browse Source 
fix:休息日管控完善
add:
This commit is contained in:
fanhuitong
2021-09-02 18:29:43 +08:00
parent d7b996f1d5
commit 99064e7691
32 changed files with 255 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-xhdpi/banner.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 92 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_menu_search.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_place_holder.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_download_task.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_my_task.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_search.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_update_task.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
app/src/main/res/drawable-xhdpi/land_banner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 155 KiB

BIN
app/src/main/res/drawable-xhdpi/port_banner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 KiB

2
app/src/main/res/drawable/btn_shap_delete.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid
android:color="@color/red" />
android:color="@color/adapter_selector_default" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="30dp"

5
app/src/main/res/layout-land/activity_main.xml
View File

@@ -27,7 +27,8 @@
android:layout_marginLeft="20dp"
android:adjustViewBounds="true"
android:background="@drawable/ic_place_holder"
android:scaleType="centerInside" />
android:scaleType="centerInside"
android:visibility="gone" />
<RelativeLayout
android:id="@+id/search_layout"
@@ -60,7 +61,7 @@
android:adjustViewBounds="true"
android:background="@color/search"
android:scaleType="centerInside"
android:src="@drawable/icon_search" />
android:src="@drawable/ic_menu_search" />
<TextView
android:layout_width="match_parent"

66
app/src/main/res/layout-land/activity_searcher.xml
View File

@@ -10,7 +10,6 @@
android:id="@+id/linearLayout3"
android:layout_width="match_parent"
android:layout_height="@dimen/activity_title_height"
android:background="@color/white"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -25,31 +24,54 @@
android:scaleType="centerInside"
android:src="@drawable/ic_back" />
<androidx.appcompat.widget.SearchView
android:id="@+id/search"
<LinearLayout
android:id="@+id/search_ll"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/dp_40"
android:textColor="@color/default_text_color"
app:iconifiedByDefault="false"
app:queryHint="@string/search_edit"
app:searchIcon="@drawable/ic_menu_search">
android:layout_height="@dimen/dp_40"
android:layout_gravity="center"
android:gravity="center_vertical">
<ImageView
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_40"
android:gravity="center_vertical"
android:src="@drawable/shap_search_left" />
<ImageView
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_40"
android:adjustViewBounds="true"
android:background="@color/search"
android:scaleType="centerInside"
android:src="@drawable/ic_menu_search" />
<EditText
android:id="@+id/edit_search"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:background="@drawable/shap_search_right"
android:gravity="center_vertical"
android:hint="@string/search_edit"
android:imeOptions="actionSearch"
android:inputType="text"
android:textColor="#a7a5a5">
</EditText>
</LinearLayout>
</androidx.appcompat.widget.SearchView>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="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" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="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" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout-land/fragment_featured.xml
View File

@@ -24,8 +24,8 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_230"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/banner"
android:scaleType="fitCenter"
android:src="@drawable/land_banner"
android:layout_margin="10dp"
android:visibility="visible" />

36
app/src/main/res/layout-land/fragment_manage.xml
View File

@@ -30,14 +30,15 @@
<ImageView
android:id="@+id/iv_my"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/icon_my_task"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/manage_tv_appNum"
android:layout_width="@dimen/dp_40"
@@ -50,6 +51,7 @@
app:layout_constraintEnd_toStartOf="@+id/imageView1"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.5" />
<ImageView
android:id="@+id/imageView1"
android:layout_width="20dp"
@@ -71,8 +73,8 @@
<ImageView
android:id="@+id/iv_download"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/icon_download_task"
@@ -115,8 +117,8 @@
<ImageView
android:id="@+id/iv_update"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/icon_update_task"
@@ -164,16 +166,18 @@
<include layout="@layout/include_line_horizontal" />
<RelativeLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/manage_rv_local"
android:overScrollMode="never"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/white"
android:layout_height="match_parent" />
android:overScrollMode="never"
app:layout_constraintBottom_toTopOf="@+id/tv_version"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_nodata"
@@ -183,10 +187,18 @@
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/icon_nodata"
android:visibility="gone">
android:visibility="gone" />
</ImageView>
</RelativeLayout>
<TextView
android:id="@+id/tv_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:textSize="19sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

59
app/src/main/res/layout-land/item_local_app.xml
View File

@@ -58,27 +58,48 @@
</LinearLayout>
<Button
android:id="@+id/local_app_btn_delete"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_30"
android:layout_gravity="center_vertical"
android:layout_marginRight="10dp"
android:background="@drawable/btn_shap_download"
android:stateListAnimator="@null"
android:text="删除"
android:textColor="@color/default_text_color"
android:visibility="visible" />
<TextView
android:id="@+id/local_app_update"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="@dimen/dp_64"
android:layout_height="wrap_content"
android:layout_marginRight="16dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="20dp"
android:text="已安装"
android:visibility="gone" />
android:orientation="vertical">
<Button
android:id="@+id/local_app_btn_open"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_32"
android:layout_gravity="center_vertical"
android:layout_marginRight="10dp"
android:background="@drawable/btn_shap_open"
android:stateListAnimator="@null"
android:text="打开"
android:textColor="@color/white"
android:visibility="visible" />
<Button
android:id="@+id/local_app_btn_delete"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_32"
android:layout_marginTop="4dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="8dp"
android:background="@drawable/btn_shap_delete"
android:stateListAnimator="@null"
android:text="删除"
android:textColor="@color/black"
android:visibility="visible" />
<TextView
android:id="@+id/local_app_update"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="24dp"
android:text="已安装"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>

3
app/src/main/res/layout-port/activity_main.xml
View File

@@ -26,6 +26,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="20dp"
android:adjustViewBounds="true"
android:visibility="gone"
android:background="@drawable/ic_place_holder"
android:scaleType="centerInside" />
@@ -60,7 +61,7 @@
android:adjustViewBounds="true"
android:background="@color/search"
android:scaleType="centerInside"
android:src="@drawable/icon_search" />
android:src="@drawable/ic_menu_search" />
<TextView
android:layout_width="match_parent"

2
app/src/main/res/layout-port/activity_searcher.xml
View File

@@ -44,7 +44,7 @@
android:adjustViewBounds="true"
android:background="@color/search"
android:scaleType="centerInside"
android:src="@drawable/icon_search" />
android:src="@drawable/ic_menu_search" />
<EditText
android:id="@+id/edit_search"

4
app/src/main/res/layout-port/fragment_featured.xml
View File

@@ -23,8 +23,8 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_230"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/banner"
android:scaleType="fitCenter"
android:src="@drawable/port_banner"
android:layout_margin="10dp"
android:visibility="visible" />

34
app/src/main/res/layout-port/fragment_manage.xml
View File

@@ -30,8 +30,8 @@
<ImageView
android:id="@+id/iv_my"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/icon_my_task"
@@ -73,8 +73,8 @@
<ImageView
android:id="@+id/iv_download"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/icon_download_task"
@@ -117,8 +117,8 @@
<ImageView
android:id="@+id/iv_update"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/icon_update_task"
@@ -166,16 +166,18 @@
<include layout="@layout/include_line_horizontal" />
<RelativeLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/manage_rv_local"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="0dp"
android:background="@color/white"
android:overScrollMode="never" />
android:overScrollMode="never"
app:layout_constraintBottom_toTopOf="@+id/tv_version"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_nodata"
@@ -185,10 +187,18 @@
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/icon_nodata"
android:visibility="gone">
android:visibility="gone" />
</ImageView>
</RelativeLayout>
<TextView
android:id="@+id/tv_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:textSize="19sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

2
app/src/main/res/layout-port/item_local_app.xml
View File

@@ -86,7 +86,7 @@
android:background="@drawable/btn_shap_delete"
android:stateListAnimator="@null"
android:text="删除"
android:textColor="@color/white"
android:textColor="@color/black"
android:visibility="visible" />
<TextView

2
app/src/main/res/values/colors.xml
View File

@@ -15,6 +15,6 @@
<color name="search">#F1F1F1</color>
<color name="red">#d64743</color>
<color name="blue">#00a0e9</color>
<color name="adapter_selector_default">#d8d8d8</color>
<color name="adapter_selector_default">#f0f0f0</color>
</resources>

2
app/src/main/res/values/strings.xml
View File

@@ -2,6 +2,6 @@
<string name="app_name">应用市场</string>
<string name="download_btn_had">打开</string>
<string name="open_app_fail">打开失败!</string>
<string name="search_edit">请输入应用名称或关键字</string>
<string name="search_edit">\t请输入应用名称或关键字</string>
</resources>