From 37e85579ae6d31f8d917bcaad43492f1f25ff35e Mon Sep 17 00:00:00 2001
From: fangshicai <1312964935@qq.com>
Date: Thu, 23 Jun 2022 14:14:53 +0800
Subject: [PATCH] =?UTF-8?q?"=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                | 46 ++++++++-------
 app/build.gradle                              |  1 -
 app/src/main/res/layout/activity_delivery.xml | 12 ++--
 .../res/layout/activity_delivery_detail.xml   | 13 ++---
 app/src/main/res/layout/item_book_info.xml    | 34 +++++------
 app/src/main/res/layout/item_delivery.xml     | 56 +++++++++----------
 .../main/res/layout/item_delivery_select.xml  | 56 +++++++++----------
 app/src/main/res/values/colors.xml            | 10 ++++
 8 files changed, 117 insertions(+), 111 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7222c2e..4c9840b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,28 +3,11 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/drawable/btn_normal.xml" value="0.183" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/drawable/btn_pressed.xml" value="0.183" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/drawable/btn_selector.xml" value="0.183" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/drawable/custom_rc_divider.xml" value="0.187" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/drawable/divider.xml" value="0.1" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/drawable/setting_arrow.xml" value="0.1" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/activity_delivery.xml" value="0.2203125" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/activity_delivery_detail.xml" value="0.2203125" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/activity_goods_details.xml" value="0.2203125" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/activity_login.xml" value="0.2" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/activity_main.xml" value="0.23505434782608695" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/fragment_my_page.xml" value="0.11277173913043478" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/fragment_publish_page.xml" value="0.11277173913043478" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/item_book_info.xml" value="0.2203125" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/item_delivery.xml" value="0.2203125" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/item_delivery_select.xml" value="0.2203125" />
-        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/third_fragment.xml" value="0.23505434782608695" />
-        <entry key="..\:/Users/HP/Desktop/android_Course_setting/androidF/android_course_design/app/src/main/res/layout/goods_show_item.xml" value="0.25" />
-        <entry key="..\:/Users/HP/Desktop/android_Course_setting/androidF/android_course_design/app/src/main/res/layout/item_stagger.xml" value="0.3729166666666667" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/add_shopping_cart_24.xml" value="0.108" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_account_circle_18.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_account_circle_20.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_account_circle_24.xml" value="0.1345" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_add_shopping_cart_24.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_explore_24.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_favorite_24.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_feedback_24.xml" value="0.1345" />
@@ -33,20 +16,35 @@
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_search_24.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_shopping_cart_24.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/btn_shape_o.xml" value="0.136" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/custom_rc_divider.xml" value="0.1" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/ic_baseline_close_24.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/ic_launcher_background.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/ic_lock_outline_black_24dp.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/ic_person_outline_black_24dp.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/ic_visibility_black_24dp.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/ic_visibility_off_black_24dp.xml" value="0.1345" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_confirm_purchase.xml" value="0.2" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_delivery.xml" value="0.1" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_delivery_detail.xml" value="0.1" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_detail.xml" value="0.11354166666666667" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_home_page.xml" value="0.152" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_goods_details.xml" value="0.1" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_home_page.xml" value="0.2" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_login.xml" value="0.176" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_main.xml" value="0.1" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_home_page.xml" value="0.4" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_goods_type.xml" value="0.15208333333333332" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_home_page.xml" value="0.12" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_message_page.xml" value="0.13229166666666667" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_my_page.xml" value="0.13229166666666667" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_shop_page.xml" value="0.1837916063675832" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/list_good_stype_item.xml" value="0.264" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_my_page.xml" value="0.176" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_phone.xml" value="0.10572916666666667" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_publish_page.xml" value="0.2" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_shop_page.xml" value="0.2" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/goods_show_item.xml" value="0.128" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/item_book_info.xml" value="0.1" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/item_delivery.xml" value="0.1" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/item_delivery_select.xml" value="0.1" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/item_stagger.xml" value="0.2" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/list_good_stype_item.xml" value="0.2" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/third_fragment.xml" value="0.264" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/menu/bottom_navigation_menu.xml" value="0.176" />
       </map>
     </option>
diff --git a/app/build.gradle b/app/build.gradle
index 4862c56..d5df745 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,7 +38,6 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
     def fragment_version = "1.4.1"
     //    okhttp
     implementation('com.squareup.okhttp3:okhttp:5.0.0-alpha.7')
diff --git a/app/src/main/res/layout/activity_delivery.xml b/app/src/main/res/layout/activity_delivery.xml
index 08c978a..dad1bba 100644
--- a/app/src/main/res/layout/activity_delivery.xml
+++ b/app/src/main/res/layout/activity_delivery.xml
@@ -5,19 +5,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    app:left_btn_src="@drawable/icon_back"
-    app:left_btn_visible="true"
-    app:title_text="我的地址簿"
-    app:title_visible="true"
     android:background="#E6E6E6">
+<!--    app:left_btn_src="@drawable/icon_back"-->
+<!--    app:left_btn_visible="true"-->
+<!--    app:title_text="我的地址簿"-->
+<!--    app:title_visible="true"-->
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_delivery"
         android:background="#E6E6E6"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1">
-    </android.support.v7.widget.RecyclerView>
+    </androidx.recyclerview.widget.RecyclerView>
 
     <Button
         android:id="@+id/btn_delivery_add"
diff --git a/app/src/main/res/layout/activity_delivery_detail.xml b/app/src/main/res/layout/activity_delivery_detail.xml
index efc99b4..5096ad3 100644
--- a/app/src/main/res/layout/activity_delivery_detail.xml
+++ b/app/src/main/res/layout/activity_delivery_detail.xml
@@ -7,14 +7,13 @@
     android:orientation="vertical"
     android:divider="@drawable/custom_rc_divider"
     android:showDividers="middle|end"
-    app:left_btn_src="@drawable/icon_back"
-    app:left_btn_visible="true"
-    app:title_text="新增地址"
-    app:title_visible="true"
-    app:right_tv_text="保存"
-    app:right_tv_visible="true"
     android:background="#000000">
-    
+<!--    app:left_btn_src="@drawable/icon_back"-->
+<!--    app:left_btn_visible="true"-->
+<!--    app:title_text="新增地址"-->
+<!--    app:title_visible="true"-->
+<!--    app:right_tv_text="保存"-->
+<!--    app:right_tv_visible="true"-->
     <LinearLayout
         android:layout_marginTop="15dp"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_book_info.xml b/app/src/main/res/layout/item_book_info.xml
index 2fadafa..3acb1ff 100644
--- a/app/src/main/res/layout/item_book_info.xml
+++ b/app/src/main/res/layout/item_book_info.xml
@@ -5,24 +5,24 @@
     android:background="@color/PureWhite"
     xmlns:android="http://schemas.android.com/apk/res/android">
     
-    <CheckBox
-        android:id="@+id/cb_bookinfo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:checked="true"
-        android:button="@drawable/cart_checkbox"
-        android:layout_marginLeft="10dp"/>
+<!--    <CheckBox-->
+<!--        android:id="@+id/cb_bookinfo"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_gravity="center_vertical"-->
+<!--        android:checked="true"-->
+<!--        android:button="@drawable/cart_checkbox"-->
+<!--        android:layout_marginLeft="10dp"/>-->
 
-    <ImageView
-        android:id="@+id/iv_bookinfo_cover"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="5dp"
-        android:layout_gravity="center_vertical"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:scaleType="fitCenter"
-        android:src="@mipmap/icon_book_sample"/>
+<!--    <ImageView-->
+<!--        android:id="@+id/iv_bookinfo_cover"-->
+<!--        android:layout_marginTop="10dp"-->
+<!--        android:layout_marginBottom="5dp"-->
+<!--        android:layout_gravity="center_vertical"-->
+<!--        android:layout_width="120dp"-->
+<!--        android:layout_height="120dp"-->
+<!--        android:scaleType="fitCenter"-->
+<!--        android:src="@mipmap/icon_book_sample"/>-->
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_delivery.xml b/app/src/main/res/layout/item_delivery.xml
index 6bf2a70..aa45d2d 100644
--- a/app/src/main/res/layout/item_delivery.xml
+++ b/app/src/main/res/layout/item_delivery.xml
@@ -67,34 +67,34 @@
             android:textColor="@color/text_clo"
             android:textSize="18sp"
             android:text="设为默认"/>
-        <com.example.xmfy.yzubookshop.widget.RichText
-            android:id="@+id/tv_delivery_edit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            app:drawable_src="@mipmap/icon_delivery_edit"
-            app:drawable_location="left"
-            app:drawable_height="25dp"
-            app:drawable_width="25dp"
-            android:drawablePadding="5dp"
-            android:textColor="@color/text_clo"
-            android:textSize="18sp"
-            android:text="修改"/>
+<!--        <com.example.xmfy.yzubookshop.widget.RichText-->
+<!--            android:id="@+id/tv_delivery_edit"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:gravity="center_vertical"-->
+<!--            app:drawable_src="@mipmap/icon_delivery_edit"-->
+<!--            app:drawable_location="left"-->
+<!--            app:drawable_height="25dp"-->
+<!--            app:drawable_width="25dp"-->
+<!--            android:drawablePadding="5dp"-->
+<!--            android:textColor="@color/text_clo"-->
+<!--            android:textSize="18sp"-->
+<!--            android:text="修改"/>-->
 
-        <com.example.xmfy.yzubookshop.widget.RichText
-            android:id="@+id/tv_delivery_delete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            app:drawable_src="@mipmap/icon_delivery_delete"
-            app:drawable_location="left"
-            app:drawable_height="25dp"
-            app:drawable_width="25dp"
-            android:paddingLeft="5dp"
-            android:paddingRight="10dp"
-            android:drawablePadding="5dp"
-            android:textColor="@color/text_clo"
-            android:textSize="18sp"
-            android:text="删除"/>
+<!--        <com.example.xmfy.yzubookshop.widget.RichText-->
+<!--            android:id="@+id/tv_delivery_delete"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:gravity="center_vertical"-->
+<!--            app:drawable_src="@mipmap/icon_delivery_delete"-->
+<!--            app:drawable_location="left"-->
+<!--            app:drawable_height="25dp"-->
+<!--            app:drawable_width="25dp"-->
+<!--            android:paddingLeft="5dp"-->
+<!--            android:paddingRight="10dp"-->
+<!--            android:drawablePadding="5dp"-->
+<!--            android:textColor="@color/text_clo"-->
+<!--            android:textSize="18sp"-->
+<!--            android:text="删除"/>-->
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_delivery_select.xml b/app/src/main/res/layout/item_delivery_select.xml
index 6bf2a70..aa45d2d 100644
--- a/app/src/main/res/layout/item_delivery_select.xml
+++ b/app/src/main/res/layout/item_delivery_select.xml
@@ -67,34 +67,34 @@
             android:textColor="@color/text_clo"
             android:textSize="18sp"
             android:text="设为默认"/>
-        <com.example.xmfy.yzubookshop.widget.RichText
-            android:id="@+id/tv_delivery_edit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            app:drawable_src="@mipmap/icon_delivery_edit"
-            app:drawable_location="left"
-            app:drawable_height="25dp"
-            app:drawable_width="25dp"
-            android:drawablePadding="5dp"
-            android:textColor="@color/text_clo"
-            android:textSize="18sp"
-            android:text="修改"/>
+<!--        <com.example.xmfy.yzubookshop.widget.RichText-->
+<!--            android:id="@+id/tv_delivery_edit"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:gravity="center_vertical"-->
+<!--            app:drawable_src="@mipmap/icon_delivery_edit"-->
+<!--            app:drawable_location="left"-->
+<!--            app:drawable_height="25dp"-->
+<!--            app:drawable_width="25dp"-->
+<!--            android:drawablePadding="5dp"-->
+<!--            android:textColor="@color/text_clo"-->
+<!--            android:textSize="18sp"-->
+<!--            android:text="修改"/>-->
 
-        <com.example.xmfy.yzubookshop.widget.RichText
-            android:id="@+id/tv_delivery_delete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            app:drawable_src="@mipmap/icon_delivery_delete"
-            app:drawable_location="left"
-            app:drawable_height="25dp"
-            app:drawable_width="25dp"
-            android:paddingLeft="5dp"
-            android:paddingRight="10dp"
-            android:drawablePadding="5dp"
-            android:textColor="@color/text_clo"
-            android:textSize="18sp"
-            android:text="删除"/>
+<!--        <com.example.xmfy.yzubookshop.widget.RichText-->
+<!--            android:id="@+id/tv_delivery_delete"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:gravity="center_vertical"-->
+<!--            app:drawable_src="@mipmap/icon_delivery_delete"-->
+<!--            app:drawable_location="left"-->
+<!--            app:drawable_height="25dp"-->
+<!--            app:drawable_width="25dp"-->
+<!--            android:paddingLeft="5dp"-->
+<!--            android:paddingRight="10dp"-->
+<!--            android:drawablePadding="5dp"-->
+<!--            android:textColor="@color/text_clo"-->
+<!--            android:textSize="18sp"-->
+<!--            android:text="删除"/>-->
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5422009..7ae8af8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -38,4 +38,14 @@
     <color name="tag_border">#FFFFFF</color>
     <color name="tag_bg">#FFEBEA</color>
     <color name="tag_text">#433837</color>
+
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="grey">#C8C5C5</color>
+    <color name="red">#DC0707</color>
 </resources>