From 55ad475b09443474ad2c59ae9e3e7290110d4c2e Mon Sep 17 00:00:00 2001
From: Michael <66694@msn.com>
Date: Thu, 23 Jun 2022 19:05:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml            |   4 +-
 .idea/gradle.xml                              |   1 -
 .idea/misc.xml                                |   6 +
 app/src/main/AndroidManifest.xml              |  34 ++---
 .../java/com/android/DeliverActivity.java     |  25 ++++
 .../com/android/DetailDeliveryActivity.java   |  14 +++
 .../main/java/com/android/MainActivity.java   |   2 +-
 .../activity/fragment/MyPageFragment.java     |  12 ++
 .../main/java/com/android/model/Delivery.java | 119 ++++++++++++++++++
 app/src/main/res/drawable/icon_back.png       | Bin 0 -> 2519 bytes
 app/src/main/res/layout/activity_delivery.xml |   8 +-
 .../res/layout/activity_delivery_detail.xml   |  35 ++++--
 app/src/main/res/layout/fragment_my_page.xml  |   8 +-
 app/src/main/res/layout/item_delivery.xml     |  56 ++++-----
 .../main/res/layout/item_delivery_select.xml  |  56 ++++-----
 .../mipmap-xxxhdpi/icon_delivery_delete.png   | Bin 0 -> 2248 bytes
 .../res/mipmap-xxxhdpi/icon_delivery_edit.png | Bin 0 -> 2647 bytes
 app/src/main/res/values/attrs.xml             |  34 +++++
 18 files changed, 325 insertions(+), 89 deletions(-)
 create mode 100644 app/src/main/java/com/android/DeliverActivity.java
 create mode 100644 app/src/main/java/com/android/DetailDeliveryActivity.java
 create mode 100644 app/src/main/java/com/android/model/Delivery.java
 create mode 100644 app/src/main/res/drawable/icon_back.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/icon_delivery_delete.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/icon_delivery_edit.png
 create mode 100644 app/src/main/res/values/attrs.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index d5b2e23..6b7bd08 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\fangshicai\.android\avd\Pixel_2_XL_API_30.avd" />
+            <value value="C:\Android\.android\avd\Pixel_XL_API_30.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-06-15T13:04:33.385030900Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-06-23T08:11:20.809936600Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3e0364f..66ff961 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,6 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$PROJECT_DIR$/../../programfile/gradleFile/gradle-7.4-all/gradle-7.4" />
         <option name="gradleJvm" value="Android Studio java home" />
         <option name="modules">
           <set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4c9840b..4511e85 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,12 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/activity_delivery.xml" value="0.2" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/activity_delivery_detail.xml" value="0.22" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/fragment_goods_type.xml" value="0.36614583333333334" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/fragment_my_page.xml" value="0.21875" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/item_delivery.xml" value="0.21875" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/item_delivery_select.xml" value="0.21875" />
         <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" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cd4f9cd..d6c4531 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,13 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.android">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /><!-- 获取sd卡写的权限，用于文件上传和下载 -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!-- 获取sd卡读的权限，用于文件上传和下载 -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- 获取sd卡写的权限，用于文件上传和下载 -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- 获取sd卡读的权限，用于文件上传和下载 -->
     <uses-permission android:name="android.permission.INTERNET" /> <!-- 允许联网 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 获取GSM（2g）、WCDMA（联通3g）等网络状态的信息 -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- 获取wifi网络状态的信息 -->
     <uses-permission android:name="android.permission.WAKE_LOCK" /> <!-- 以便 CPU 在屏幕关闭时保持运行状态，用于文件上传和下载 -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <!-- 允许读取手机状态 用于创建BmobInstallation -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
     <application
         android:allowBackup="true"
@@ -22,6 +22,12 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Android_Couser_Design"
         tools:targetApi="31">
+        <activity
+            android:name=".DetailDeliveryActivity"
+            android:exported="false" />
+        <activity
+            android:name=".DeliverActivity"
+            android:exported="false" />
         <activity
             android:name=".activity.ConfirmPurchaseActivity"
             android:exported="false" />
@@ -33,25 +39,25 @@
             android:name=".activity.HomePageActivity"
             android:exported="false"
             android:launchMode="singleTask">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
 
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
+
+
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
         <activity
             android:name=".activity.LoginActivity"
             android:exported="true"
             android:launchMode="singleTask">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-             <intent-filter>
-             <action android:name="android.intent.action.MAIN" />
-
-
-             <category android:name="android.intent.category.LAUNCHER" />
-             </intent-filter>
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
-        <activity android:name="com.android.MainActivity" />
+        <activity android:name=".MainActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/android/DeliverActivity.java b/app/src/main/java/com/android/DeliverActivity.java
new file mode 100644
index 0000000..21ea084
--- /dev/null
+++ b/app/src/main/java/com/android/DeliverActivity.java
@@ -0,0 +1,25 @@
+package com.android;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class DeliverActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_delivery);
+        Button new_addr = findViewById(R.id.btn_delivery_add);
+        new_addr.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                Intent intent = new Intent(DeliverActivity.this,
+                        DetailDeliveryActivity.class);
+                startActivity(intent);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/android/DetailDeliveryActivity.java b/app/src/main/java/com/android/DetailDeliveryActivity.java
new file mode 100644
index 0000000..afd50e1
--- /dev/null
+++ b/app/src/main/java/com/android/DetailDeliveryActivity.java
@@ -0,0 +1,14 @@
+package com.android;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+public class DetailDeliveryActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_delivery_detail);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/android/MainActivity.java b/app/src/main/java/com/android/MainActivity.java
index 8430192..c345a68 100644
--- a/app/src/main/java/com/android/MainActivity.java
+++ b/app/src/main/java/com/android/MainActivity.java
@@ -4,7 +4,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
 
-public class MainActivity extends AppCompatActivity{
+public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/com/android/activity/fragment/MyPageFragment.java b/app/src/main/java/com/android/activity/fragment/MyPageFragment.java
index c7cd8f9..c2e2fd0 100644
--- a/app/src/main/java/com/android/activity/fragment/MyPageFragment.java
+++ b/app/src/main/java/com/android/activity/fragment/MyPageFragment.java
@@ -1,5 +1,6 @@
 package com.android.activity.fragment;
 
+import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
@@ -8,8 +9,11 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.TextView;
 
+import com.android.DeliverActivity;
+import com.android.MainActivity;
 import com.android.R;
 import com.android.bean.ResponseData;
 import com.android.bean.User;
@@ -109,6 +113,14 @@ public class MyPageFragment extends Fragment {
         // Inflate the layout for this fragment
          view = inflater.inflate(R.layout.fragment_my_page, container, false);
          TextView tvName = view.findViewById(R.id.tv_name);
+        Button rece_addr = view.findViewById(R.id.btn_my_recevive_goods);
+        rece_addr.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity(),
+                        DeliverActivity.class);
+                startActivity(intent);
+            }
+        });
         tvName.setText(user.getUserName());
         return view;
     }
diff --git a/app/src/main/java/com/android/model/Delivery.java b/app/src/main/java/com/android/model/Delivery.java
new file mode 100644
index 0000000..d64e940
--- /dev/null
+++ b/app/src/main/java/com/android/model/Delivery.java
@@ -0,0 +1,119 @@
+package com.android.model;
+
+/**
+ * Created by xmfy on 2018/1/16.
+ */
+public class Delivery {
+
+    private int id;
+    private String account;
+    private String receiver;
+    private String phone;
+    private String province;
+    private String city;
+    private String district;
+    private String location;
+    private Integer defaults;
+
+    public Delivery() {
+    }
+
+    public Delivery(int id, String account, String receiver, String phone, String province, String city, String district, String location, Integer defaults) {
+        this.id = id;
+        this.account = account;
+        this.receiver = receiver;
+        this.phone = phone;
+        this.province = province;
+        this.city = city;
+        this.district = district;
+        this.location = location;
+        this.defaults = defaults;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public Integer getDefaults() {
+        return defaults;
+    }
+
+    public void setDefaults(Integer defaults) {
+        this.defaults = defaults;
+    }
+
+    @Override
+    public String toString() {
+        return "Delivery{" +
+                "id=" + id +
+                ", account='" + account + '\'' +
+                ", receiver='" + receiver + '\'' +
+                ", phone='" + phone + '\'' +
+                ", province='" + province + '\'' +
+                ", city='" + city + '\'' +
+                ", district='" + district + '\'' +
+                ", location='" + location + '\'' +
+                ", defaults=" + defaults +
+                '}';
+    }
+}
diff --git a/app/src/main/res/drawable/icon_back.png b/app/src/main/res/drawable/icon_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..3caa36a3c538682fbc57d58de5db61b3a5c4d04a
GIT binary patch
literal 2519
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
KTd>Ui(*FbkmQ9@i

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_delivery.xml b/app/src/main/res/layout/activity_delivery.xml
index dad1bba..8bf6856 100644
--- a/app/src/main/res/layout/activity_delivery.xml
+++ b/app/src/main/res/layout/activity_delivery.xml
@@ -5,11 +5,11 @@
     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"-->
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_delivery"
diff --git a/app/src/main/res/layout/activity_delivery_detail.xml b/app/src/main/res/layout/activity_delivery_detail.xml
index 5096ad3..50a83da 100644
--- a/app/src/main/res/layout/activity_delivery_detail.xml
+++ b/app/src/main/res/layout/activity_delivery_detail.xml
@@ -7,13 +7,14 @@
     android:orientation="vertical"
     android:divider="@drawable/custom_rc_divider"
     android:showDividers="middle|end"
-    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"-->
+    android:background="@color/PureWhite"
+    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"
@@ -137,5 +138,25 @@
             android:theme="@style/AppTheme" />
 
     </LinearLayout>
+    <LinearLayout
+        android:layout_marginTop="15dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:orientation="horizontal"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:gravity="center_horizontal">
+        <Button
+            android:id="@+id/btn_save"
+            android:layout_width="334dp"
+            android:layout_height="60dp"
+            android:background="@drawable/btn_selector"
+
+            android:text="保存"
+            android:textColor="@color/black"
+            android:textSize="23sp" />
+
+    </LinearLayout>
+
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
index 5774948..9344cf8 100644
--- a/app/src/main/res/layout/fragment_my_page.xml
+++ b/app/src/main/res/layout/fragment_my_page.xml
@@ -106,7 +106,7 @@
 
         <Button
             android:background="#00000000"
-            android:textColor="#33000000"
+            android:textColor="@color/black"
             android:drawableTop="@drawable/my_released"
             android:text="我发布的"
             android:id="@+id/btn_my_released_goods"
@@ -117,8 +117,8 @@
             android:background="#00000000"
             android:drawableTop="@drawable/receivegoods"
             android:text="收货地址"
-            android:textColor="#33000000"
-            android:id="@+id/btn_my_served_goods"
+            android:textColor="@color/black"
+            android:id="@+id/btn_my_recevive_goods"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
     </LinearLayout>
@@ -130,7 +130,7 @@
 
         <Button
             android:background="@drawable/btn_selector"
-            android:textColor="#33000000"
+            android:textColor="@color/black"
             android:layout_marginTop="20dp"
             android:text="退出登录"
             android:id="@+id/btn_logout"
diff --git a/app/src/main/res/layout/item_delivery.xml b/app/src/main/res/layout/item_delivery.xml
index aa45d2d..e725ba1 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="修改"/>-->
+        <TextView
+            android:id="@+id/tv_delivery_edi"
+            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="删除"/>-->
+        <TextView
+            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 aa45d2d..975df13 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="修改"/>-->
+        <TextView
+            android:id="@+id/tv_del"
+            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="删除"/>-->
+        <TextView
+            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/mipmap-xxxhdpi/icon_delivery_delete.png b/app/src/main/res/mipmap-xxxhdpi/icon_delivery_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..37712d95e181f64c1683cc3669c2916577e47c27
GIT binary patch
literal 2248
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
KNvOQw82dNzTl!r9

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_delivery_edit.png b/app/src/main/res/mipmap-xxxhdpi/icon_delivery_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..95980e0db6b117620a09936a6b6cd9da3030d479
GIT binary patch
literal 2647
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..06d2c69
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="CustomToolBar">
+        <attr name="left_btn_visible" format="boolean"/>
+        <attr name="left_btn_src" format="reference|color"/>
+        <attr name="left_tv_visible" format="boolean"/>
+        <attr name="left_tv_text" format="string"/>
+        <attr name="right_btn_visible" format="boolean"/>
+        <attr name="right_btn_src" format="reference|color"/>
+        <attr name="right_tv_visible" format="boolean"/>
+        <attr name="right_tv_text" format="string"/>
+        <attr name="title_visible" format="boolean"/>
+        <attr name="title_text" format="string"/>
+        <attr name="barBackground" format="color|reference"/>
+    </declare-styleable>
+
+    <declare-styleable name="CircleImageView">
+        <attr name="border_width" format="dimension" />
+        <attr name="border_color" format="color" />
+    </declare-styleable>
+
+    <!-- 自定义TextView -->
+    <declare-styleable name="RichText">
+        <attr name="drawable_src" format="reference" />
+        <attr name="drawable_height" format="dimension" />
+        <attr name="drawable_width" format="dimension" />
+        <attr name="drawable_location">
+            <enum name="left" value="1" />
+            <enum name="top" value="2" />
+            <enum name="right" value="3" />
+            <enum name="bottom" value="4" />
+        </attr>
+    </declare-styleable>
+</resources>
\ No newline at end of file

From f5f19096f64c79f5c77fc132f905da54fa5b48db Mon Sep 17 00:00:00 2001
From: Michael <66694@msn.com>
Date: Thu, 23 Jun 2022 20:23:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=99=BB=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/android/activity/LoginActivity.java    | 5 +++++
 .../com/android/activity/fragment/MyPageFragment.java    | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/src/main/java/com/android/activity/LoginActivity.java b/app/src/main/java/com/android/activity/LoginActivity.java
index 55302cf..6c7e059 100644
--- a/app/src/main/java/com/android/activity/LoginActivity.java
+++ b/app/src/main/java/com/android/activity/LoginActivity.java
@@ -8,6 +8,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.Toast;
 
 import com.android.R;
 import com.android.bean.ResponseData;
@@ -67,6 +68,8 @@ public class LoginActivity extends AppCompatActivity implements LoginListener, V
         switch (v.getId()){
             case R.id.bt_getCode:
                 loginModel.sendVerifyCode(account,this);
+                Toast.makeText(LoginActivity.this, "验证码发送成功！",
+                        Toast.LENGTH_SHORT).show();
                 Log.e("TAG","验证码");break;
             case R.id.bt_login:Log.e("TAG","登录");
                 password = etPwd.getText().toString();
@@ -112,6 +115,8 @@ public class LoginActivity extends AppCompatActivity implements LoginListener, V
             EventBus.getDefault().postSticky(responseData);
             startActivity(intent);
         }else {
+            Toast.makeText(LoginActivity.this, "登录信息有误！请仔细检查！",
+                    Toast.LENGTH_SHORT).show();
             Log.e("login",responseData.getMsg());
         }
     }
diff --git a/app/src/main/java/com/android/activity/fragment/MyPageFragment.java b/app/src/main/java/com/android/activity/fragment/MyPageFragment.java
index c2e2fd0..74c05de 100644
--- a/app/src/main/java/com/android/activity/fragment/MyPageFragment.java
+++ b/app/src/main/java/com/android/activity/fragment/MyPageFragment.java
@@ -15,6 +15,7 @@ import android.widget.TextView;
 import com.android.DeliverActivity;
 import com.android.MainActivity;
 import com.android.R;
+import com.android.activity.LoginActivity;
 import com.android.bean.ResponseData;
 import com.android.bean.User;
 
@@ -121,6 +122,14 @@ public class MyPageFragment extends Fragment {
                 startActivity(intent);
             }
         });
+        Button log_out = view.findViewById(R.id.btn_logout);
+        log_out.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity(),
+                        LoginActivity.class);
+                startActivity(intent);
+            }
+        });
         tvName.setText(user.getUserName());
         return view;
     }

From 1f45613999b56a2b2c62ea735721ea9ccd2fcdf3 Mon Sep 17 00:00:00 2001
From: Michael <66694@msn.com>
Date: Fri, 24 Jun 2022 01:37:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BB=8E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=98=E5=8F=96=E6=94=B6=E8=B4=A7=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  1 +
 app/src/main/AndroidManifest.xml              |  4 +-
 .../java/com/android/DeliverActivity.java     | 25 ------
 .../com/android/DetailDeliveryActivity.java   | 14 ----
 .../com/android/SQL/MySQLiteOpenHelper.java   | 80 ++++++++++++++++++
 .../com/android/activity/DeliverActivity.java | 83 +++++++++++++++++++
 .../activity/DetailDeliveryActivity.java      | 67 +++++++++++++++
 .../activity/adapter/DeliverysAdapter.java    | 47 +++++++++++
 .../activity/fragment/MyPageFragment.java     |  3 +-
 .../java/com/android/bean/DeliveryAdr.java    | 16 ++++
 .../main/java/com/android/model/Delivery.java | 14 ++--
 app/src/main/res/layout/activity_delivery.xml |  6 +-
 12 files changed, 307 insertions(+), 53 deletions(-)
 delete mode 100644 app/src/main/java/com/android/DeliverActivity.java
 delete mode 100644 app/src/main/java/com/android/DetailDeliveryActivity.java
 create mode 100644 app/src/main/java/com/android/SQL/MySQLiteOpenHelper.java
 create mode 100644 app/src/main/java/com/android/activity/DeliverActivity.java
 create mode 100644 app/src/main/java/com/android/activity/DetailDeliveryActivity.java
 create mode 100644 app/src/main/java/com/android/activity/adapter/DeliverysAdapter.java
 create mode 100644 app/src/main/java/com/android/bean/DeliveryAdr.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4511e85..8ffc1dd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,6 +9,7 @@
         <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/fragment_my_page.xml" value="0.21875" />
         <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/item_delivery.xml" value="0.21875" />
         <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/item_delivery_select.xml" value="0.21875" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/item_stagger.xml" value="0.2536231884057971" />
         <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" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d6c4531..39f4347 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,10 +23,10 @@
         android:theme="@style/Theme.Android_Couser_Design"
         tools:targetApi="31">
         <activity
-            android:name=".DetailDeliveryActivity"
+            android:name=".activity.DetailDeliveryActivity"
             android:exported="false" />
         <activity
-            android:name=".DeliverActivity"
+            android:name=".activity.DeliverActivity"
             android:exported="false" />
         <activity
             android:name=".activity.ConfirmPurchaseActivity"
diff --git a/app/src/main/java/com/android/DeliverActivity.java b/app/src/main/java/com/android/DeliverActivity.java
deleted file mode 100644
index 21ea084..0000000
--- a/app/src/main/java/com/android/DeliverActivity.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.android;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-
-public class DeliverActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_delivery);
-        Button new_addr = findViewById(R.id.btn_delivery_add);
-        new_addr.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                Intent intent = new Intent(DeliverActivity.this,
-                        DetailDeliveryActivity.class);
-                startActivity(intent);
-            }
-        });
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/android/DetailDeliveryActivity.java b/app/src/main/java/com/android/DetailDeliveryActivity.java
deleted file mode 100644
index afd50e1..0000000
--- a/app/src/main/java/com/android/DetailDeliveryActivity.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.android;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-
-public class DetailDeliveryActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_delivery_detail);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/android/SQL/MySQLiteOpenHelper.java b/app/src/main/java/com/android/SQL/MySQLiteOpenHelper.java
new file mode 100644
index 0000000..36e7ca1
--- /dev/null
+++ b/app/src/main/java/com/android/SQL/MySQLiteOpenHelper.java
@@ -0,0 +1,80 @@
+package com.android.SQL;
+
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.view.View;
+
+import com.android.R;
+import com.android.bean.DeliveryAdr;
+
+public class MySQLiteOpenHelper extends SQLiteOpenHelper {
+    View view;
+    private static final String SQL_CREATE_ENTRIES =
+            "CREATE TABLE " + DeliveryAdr.DeliveryEntry.TABLE_NAME + " (" +
+                    DeliveryAdr.DeliveryEntry._ID + " INTEGER PRIMARY KEY, " +
+                    DeliveryAdr.DeliveryEntry.COLUMN_PEOPLE_NAME + " VARCHAR(200), " +
+                    DeliveryAdr.DeliveryEntry.COLUMN_PEOPLE_TELE + " VARCHAR(200), " +
+                    DeliveryAdr.DeliveryEntry.COLUMN_DETAIL_ADR + " VARCHAR(100), " +
+                    DeliveryAdr.DeliveryEntry.COLUMN_IS_RAW  + " VARCHAR(100) " +
+                    ")" ;
+
+    private static final String SQL_DELETE_ENTRIES =
+            "DROP TABLE IF EXISTS " + DeliveryAdr.DeliveryEntry.TABLE_NAME;
+
+    public static final int DATABASE_VERSION = 1;
+    public static final String DATABASE_NAME = "deliverys.db";
+
+    private Context mContext;
+    public MySQLiteOpenHelper(Context context) {
+        super(context, DATABASE_NAME, null, DATABASE_VERSION);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase sqLiteDatabase) {
+        sqLiteDatabase.execSQL(SQL_CREATE_ENTRIES);
+
+
+    }
+    @Override
+    public void onUpgrade(SQLiteDatabase sqLiteDatabase,
+                          int oldVersion, int newVersion) {
+        sqLiteDatabase.execSQL(SQL_DELETE_ENTRIES);
+        onCreate(sqLiteDatabase);
+    }
+
+//    private void initDb(SQLiteDatabase sqLiteDatabase) {
+//
+//        Resources resources = mContext.getResources();
+//        String[] titles = resources.getStringArray(R.array.titles);
+//        String[] authors = resources.getStringArray(R.array.authors);
+//        String[] contents = resources.getStringArray(R.array.contents);
+//        TypedArray images = resources.obtainTypedArray(R.array.images);
+//
+//        int length = 0;
+//        length = Math.min(titles.length, authors.length);
+//        length = Math.min(length, contents.length);
+//        length = Math.min(length, images.length());
+//
+//        for (int i = 0; i < length; i++) {
+//            ContentValues values = new ContentValues();
+//            values.put(DeliveryAdr.DeliveryEntry.COLUMN_PEOPLE_NAME ,
+//                    titles[i]);
+//            values.put(DeliveryAdr.DeliveryEntry.COLUMN_PEOPLE_TELE,
+//                    authors[i]);
+//            values.put(DeliveryAdr.DeliveryEntry.COLUMN_DETAIL_ADR ,
+//                    contents[i]);
+//            values.put(DeliveryAdr.DeliveryEntry.COLUMN_IS_RAW ,
+//                    images.getString(i));
+//
+//            long r = sqLiteDatabase.insert(
+//                    DeliveryAdr.DeliveryEntry.TABLE_NAME,
+//                    null,
+//                    values);
+//        }
+//    }
+}
diff --git a/app/src/main/java/com/android/activity/DeliverActivity.java b/app/src/main/java/com/android/activity/DeliverActivity.java
new file mode 100644
index 0000000..df63627
--- /dev/null
+++ b/app/src/main/java/com/android/activity/DeliverActivity.java
@@ -0,0 +1,83 @@
+package com.android.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ListView;
+
+import com.android.R;
+import com.android.SQL.MySQLiteOpenHelper;
+import com.android.activity.adapter.DeliverysAdapter;
+import com.android.bean.DeliveryAdr;
+import com.android.model.Delivery;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DeliverActivity extends AppCompatActivity {
+
+    MySQLiteOpenHelper myDbHelper;
+    SQLiteDatabase db;
+    private List<Delivery> deliList = new ArrayList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_delivery);
+
+        Button new_addr = findViewById(R.id.btn_delivery_add);
+        new_addr.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                Intent intent = new Intent(DeliverActivity.this,
+                        DetailDeliveryActivity.class);
+                startActivity(intent);
+            }
+        });
+        //查询数据
+        myDbHelper = new MySQLiteOpenHelper(DeliverActivity.this);
+        db = myDbHelper.getReadableDatabase();
+        Cursor cursor = db.query(
+                DeliveryAdr.DeliveryEntry.TABLE_NAME,
+                null, null, null, null, null, null);
+
+        int nameIndex = cursor.getColumnIndex(
+                DeliveryAdr.DeliveryEntry.COLUMN_PEOPLE_NAME);
+        int teleIndex = cursor.getColumnIndex(
+                DeliveryAdr.DeliveryEntry.COLUMN_PEOPLE_TELE);
+        int adrIndex = cursor.getColumnIndex(
+                DeliveryAdr.DeliveryEntry.COLUMN_DETAIL_ADR);
+        int swIndex = cursor.getColumnIndex(
+                DeliveryAdr.DeliveryEntry.COLUMN_IS_RAW);
+
+        while (cursor.moveToNext()) {
+            Delivery delivers = new Delivery();
+
+            String name = cursor.getString(nameIndex);
+            String tel = cursor.getString(teleIndex);
+            String adr = cursor.getString(adrIndex);
+            String sw = cursor.getString(swIndex);
+
+
+            delivers.setReceiver(name);
+            delivers.setPhone(tel);
+            delivers.setLocation(adr);
+            deliList.add(delivers);
+        }
+        DeliverysAdapter deliAdapter = new DeliverysAdapter(
+                DeliverActivity.this,
+                R.layout.item_delivery,
+                deliList);
+        ListView lvdelisList = findViewById(R.id.rv_delivery);
+
+        lvdelisList.setAdapter(deliAdapter);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/android/activity/DetailDeliveryActivity.java b/app/src/main/java/com/android/activity/DetailDeliveryActivity.java
new file mode 100644
index 0000000..cc357cf
--- /dev/null
+++ b/app/src/main/java/com/android/activity/DetailDeliveryActivity.java
@@ -0,0 +1,67 @@
+package com.android.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SwitchCompat;
+
+import android.content.ContentValues;
+import android.content.Intent;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.android.R;
+import com.android.SQL.MySQLiteOpenHelper;
+import com.android.bean.DeliveryAdr;
+
+public class DetailDeliveryActivity extends AppCompatActivity  {
+
+    MySQLiteOpenHelper myDbHelper;
+    SQLiteDatabase db;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_delivery_detail);
+
+        myDbHelper = new MySQLiteOpenHelper(DetailDeliveryActivity.this);
+        db = myDbHelper.getReadableDatabase();
+
+        Toast.makeText(this, "创建数据库", Toast.LENGTH_SHORT).show();
+
+
+        EditText evtel = findViewById(R.id.et_delivery_phone);
+        EditText evname = findViewById(R.id.et_delivery_receiver);
+        EditText evloc = findViewById(R.id.et_delivery_location);
+        SwitchCompat scdef = findViewById(R.id.sc_delivery_default);
+        Button btsave = findViewById(R.id.btn_save);
+
+        btsave.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                ContentValues values = new ContentValues();
+                values.put(DeliveryAdr.DeliveryEntry.COLUMN_PEOPLE_NAME ,
+                        evname.getText().toString());
+                values.put(DeliveryAdr.DeliveryEntry.COLUMN_PEOPLE_TELE,
+                        evtel.getText().toString());
+                values.put(DeliveryAdr.DeliveryEntry.COLUMN_DETAIL_ADR ,
+                        evloc.getText().toString());
+                if(scdef.isChecked())
+                    values.put(DeliveryAdr.DeliveryEntry.COLUMN_IS_RAW ,
+                            "true");
+                else
+                    values.put(DeliveryAdr.DeliveryEntry.COLUMN_IS_RAW ,
+                            "false");
+                long r = db.insert(
+                        DeliveryAdr.DeliveryEntry.TABLE_NAME,
+                        null,
+                        values);
+                db.close();
+                Log.e("TAG", "保存数据");
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/android/activity/adapter/DeliverysAdapter.java b/app/src/main/java/com/android/activity/adapter/DeliverysAdapter.java
new file mode 100644
index 0000000..d364b6b
--- /dev/null
+++ b/app/src/main/java/com/android/activity/adapter/DeliverysAdapter.java
@@ -0,0 +1,47 @@
+package com.android.activity.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.R;
+import com.android.activity.DeliverActivity;
+import com.android.model.Delivery;
+
+import java.util.List;
+
+public class DeliverysAdapter extends ArrayAdapter<Delivery> {
+
+
+    private List<Delivery> mNewsData;
+    private Context mContext;
+    private int resourceId;
+
+    public DeliverysAdapter(Context context, int resourceId, List<Delivery> data) {
+        super(context, resourceId, data);
+        this.mContext = context;
+        this.mNewsData = data;
+        this.resourceId = resourceId;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        Delivery deliverys = getItem(position);
+        View view ;
+
+        view = LayoutInflater.from(getContext()).inflate(resourceId, parent, false);
+
+        TextView tvreceiver  = view.findViewById(R.id.tv_delivery_receiver);
+        TextView tvphone = view.findViewById(R.id.tv_delivery_phone);
+        TextView tvloc = view.findViewById(R.id.tv_delivery_location);
+
+        tvreceiver.setText(deliverys.getReceiver());
+        tvphone.setText(deliverys.getPhone());
+        tvloc.setText(deliverys.getLocation());
+        return view;
+    }
+}
diff --git a/app/src/main/java/com/android/activity/fragment/MyPageFragment.java b/app/src/main/java/com/android/activity/fragment/MyPageFragment.java
index 74c05de..51639a9 100644
--- a/app/src/main/java/com/android/activity/fragment/MyPageFragment.java
+++ b/app/src/main/java/com/android/activity/fragment/MyPageFragment.java
@@ -12,8 +12,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.android.DeliverActivity;
-import com.android.MainActivity;
+import com.android.activity.DeliverActivity;
 import com.android.R;
 import com.android.activity.LoginActivity;
 import com.android.bean.ResponseData;
diff --git a/app/src/main/java/com/android/bean/DeliveryAdr.java b/app/src/main/java/com/android/bean/DeliveryAdr.java
new file mode 100644
index 0000000..733b706
--- /dev/null
+++ b/app/src/main/java/com/android/bean/DeliveryAdr.java
@@ -0,0 +1,16 @@
+package com.android.bean;
+
+import android.provider.BaseColumns;
+
+public final class DeliveryAdr {
+
+    private DeliveryAdr() {}
+
+    public static class DeliveryEntry implements BaseColumns {
+        public static final String TABLE_NAME = "tbl_deli";
+        public static final String COLUMN_PEOPLE_NAME = "rece_people";
+        public static final String COLUMN_PEOPLE_TELE = "tele";
+        public static final String COLUMN_DETAIL_ADR = "adr";
+        public static final String COLUMN_IS_RAW = "false";
+    }
+}
diff --git a/app/src/main/java/com/android/model/Delivery.java b/app/src/main/java/com/android/model/Delivery.java
index d64e940..fedd338 100644
--- a/app/src/main/java/com/android/model/Delivery.java
+++ b/app/src/main/java/com/android/model/Delivery.java
@@ -1,8 +1,8 @@
 package com.android.model;
 
-/**
- * Created by xmfy on 2018/1/16.
- */
+
+import androidx.appcompat.widget.SwitchCompat;
+
 public class Delivery {
 
     private int id;
@@ -13,12 +13,12 @@ public class Delivery {
     private String city;
     private String district;
     private String location;
-    private Integer defaults;
+    private SwitchCompat defaults;
 
     public Delivery() {
     }
 
-    public Delivery(int id, String account, String receiver, String phone, String province, String city, String district, String location, Integer defaults) {
+    public Delivery(int id, String account, String receiver, String phone, String province, String city, String district, String location, SwitchCompat defaults) {
         this.id = id;
         this.account = account;
         this.receiver = receiver;
@@ -94,11 +94,11 @@ public class Delivery {
         this.location = location;
     }
 
-    public Integer getDefaults() {
+    public SwitchCompat  getDefaults() {
         return defaults;
     }
 
-    public void setDefaults(Integer defaults) {
+    public void setDefaults(SwitchCompat  defaults) {
         this.defaults = defaults;
     }
 
diff --git a/app/src/main/res/layout/activity_delivery.xml b/app/src/main/res/layout/activity_delivery.xml
index 8bf6856..0921bdf 100644
--- a/app/src/main/res/layout/activity_delivery.xml
+++ b/app/src/main/res/layout/activity_delivery.xml
@@ -11,13 +11,13 @@
     app:title_visible="true"
     android:background="#E6E6E6">
 
-    <androidx.recyclerview.widget.RecyclerView
+    <ListView
         android:id="@+id/rv_delivery"
         android:background="#E6E6E6"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1">
-    </androidx.recyclerview.widget.RecyclerView>
+        android:layout_weight="1"
+    />
 
     <Button
         android:id="@+id/btn_delivery_add"