收货地址修改

BaseLibrary/src/main/AndroidManifest.xml

@@ -19,5 +19,14 @@
         <meta-data
             android:name="design_width_in_dp"
             android:value="375" />
+
+        <activity
+            android:name="com.cooleshow.base.ui.activity.set.AddressListActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cooleshow.base.ui.activity.set.EditAddressActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait" />
     </application>
 </manifest>

teacher/src/main/java/com/cooleshow/teacher/adapter/AddressListAdapter.java → BaseLibrary/src/main/java/com/cooleshow/base/adapter/AddressListAdapter.java

@@ -1,4 +1,4 @@
-package com.cooleshow.teacher.adapter;
+package com.cooleshow.base.adapter;
 
 import android.os.Bundle;
 import android.view.View;
@@ -8,9 +8,9 @@ import android.widget.TextView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.cooleshow.base.R;
+import com.cooleshow.base.bean.AddressBean;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.teacher.R;
-import com.cooleshow.teacher.bean.AddressBean;
 
 import java.util.List;
 
@@ -22,6 +22,8 @@ import java.util.List;
  */
 public class AddressListAdapter extends BaseQuickAdapter<AddressBean, BaseViewHolder> {
 
+    private OnDelClickListener mDelClickListener;
+
     public AddressListAdapter(List<AddressBean> data) {
         super(R.layout.layout_address_item, data);
     }
@@ -36,7 +38,7 @@ public class AddressListAdapter extends BaseQuickAdapter<AddressBean, BaseViewHo
         tv_name.setText(item.name);
         String cPhone = item.phoneNumber;
         if (item.phoneNumber.length() == 11) {
-            cPhone = item.phoneNumber.substring(0, 3) + "****" + item.phoneNumber.substring(7, item.phoneNumber.length());
+            cPhone = item.phoneNumber.substring(0, 3) + "****" + item.phoneNumber.substring(7);
         }
         tv_phone.setText(cPhone);
         String addressDetail = item.province + item.city + item.region + item.detailAddress;
@@ -47,20 +49,28 @@ public class AddressListAdapter extends BaseQuickAdapter<AddressBean, BaseViewHo
             view_line.setVisibility(View.VISIBLE);
         }
         ImageView im_modify = helper.getView(R.id.im_modify);
-        im_modify.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Bundle bundle = new Bundle();
-                bundle.putSerializable("AddressBean", item);
+        im_modify.setOnClickListener(view -> {
+            Bundle bundle = new Bundle();
+            bundle.putSerializable("AddressBean", item);
 
-                ARouter.getInstance().build(RouterPath.MineCenter.MINE_EDIT_ADDRESS)
-                        .withBoolean("isAdd", false)
-                        .withBundle("bundle", bundle)
-                        .navigation();
-            }
+            ARouter.getInstance().build(RouterPath.BaseCenter.MINE_EDIT_ADDRESS)
+                    .withBoolean("isAdd", false)
+                    .withBundle("bundle", bundle)
+                    .navigation();
         });
 
+        helper.getView(R.id.im_del).setOnClickListener(v -> {
+            if(mDelClickListener!=null){
+                mDelClickListener.delAddress(helper.getAbsoluteAdapterPosition());
+            }
+        });
     }
 
+    public void setDelClickListener(OnDelClickListener delClickListener) {
+        mDelClickListener = delClickListener;
+    }
 
+    public interface OnDelClickListener{
+        void delAddress(int position);
+    }
 }

teacher/src/main/java/com/cooleshow/teacher/bean/AddressBean.java → BaseLibrary/src/main/java/com/cooleshow/base/bean/AddressBean.java

@@ -1,4 +1,4 @@
-package com.cooleshow.teacher.bean;
+package com.cooleshow.base.bean;
 
 import java.io.Serializable;
 

BaseLibrary/src/main/java/com/cooleshow/base/bean/request/EditAddressEntry.java

@@ -0,0 +1,16 @@
+package com.cooleshow.base.bean.request;
+
+/**
+ * @author dengqw
+ * @time 2022/7/5 23:16
+ * @describe：
+ **/
+public class EditAddressEntry {
+    public String name;
+    public String phoneNumber;
+    public String province;
+    public String city;
+    public String region;
+    public int defaultStatus;
+    public String detailAddress;
+}

BaseLibrary/src/main/java/com/cooleshow/base/common/BaseConstant.java

@@ -20,6 +20,7 @@ public class BaseConstant {
     public final static String TABLE_PREFS = "Kotlin_mall";
     public final static String KEY_SP_TOKEN = "token";
     public final static String STUDENT_ID = "student_id";
+    public final static String CHECK_ADDRESS = "check_address";
 
     /**
      * 获取图片验证码地址

student/src/main/java/com/cooleshow/student/contract/AddressListContract.java → BaseLibrary/src/main/java/com/cooleshow/base/constanst/AddressListContract.java

@@ -1,7 +1,7 @@
-package com.cooleshow.student.contract;
+package com.cooleshow.base.constanst;
 
+import com.cooleshow.base.bean.AddressBean;
 import com.cooleshow.base.presenter.view.BaseView;
-import com.cooleshow.student.bean.AddressBean;
 
 import java.util.List;
 
@@ -14,6 +14,7 @@ import java.util.List;
 public interface AddressListContract {
     interface AddressListView extends BaseView {
         void companyAddressListSuccess(List<AddressBean> data);
+        void delAddress();
     }
     interface Presenter {
     }

student/src/main/java/com/cooleshow/student/contract/EditAddressContract.java → BaseLibrary/src/main/java/com/cooleshow/base/constanst/EditAddressContract.java

@@ -1,4 +1,4 @@
-package com.cooleshow.student.contract;
+package com.cooleshow.base.constanst;
 
 import com.cooleshow.base.presenter.view.BaseView;
 

BaseLibrary/src/main/java/com/cooleshow/base/data/api/UploadApi.java

@@ -1,6 +1,8 @@
 package com.cooleshow.base.data.api;
 
+import com.cooleshow.base.bean.AddressBean;
 import com.cooleshow.base.bean.UploadTokenInfoBean;
+import com.cooleshow.base.bean.request.EditAddressEntry;
 import com.cooleshow.base.data.net.BaseResponse;
 
 import java.util.List;
@@ -8,8 +10,11 @@ import java.util.List;
 import io.reactivex.rxjava3.core.Observable;
 import okhttp3.RequestBody;
 import retrofit2.http.Body;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
+import retrofit2.http.Path;
 
+import static com.cooleshow.base.common.BaseConstant.MALL_PORTAL_SERVER;
 import static com.cooleshow.base.common.BaseConstant.TEACHER_GROUP;
 import static com.cooleshow.base.common.BaseConstant.STUDENT_GROUP;
 
@@ -34,4 +39,40 @@ public interface UploadApi {
      */
     @POST(STUDENT_GROUP + "getUploadSign")
     Observable<BaseResponse<UploadTokenInfoBean>> getUploadTokenForStudent(@Body RequestBody body);
+
+    /**
+     * 获取所有收货地址
+     *
+     * @return
+     */
+    @GET(MALL_PORTAL_SERVER + "member/address/list")
+    Observable<BaseResponse<List<AddressBean>>> companyAddressList();
+
+    /**
+     * 添加收货地址
+     *
+     * @param body
+     * @return
+     */
+    @POST(MALL_PORTAL_SERVER + "member/address/add")
+    Observable<BaseResponse<Object>> createNewAddress(@Body EditAddressEntry body);
+
+    /**
+     * 修改地址
+     *
+     * @param id
+     * @param body
+     * @return
+     */
+    @POST(MALL_PORTAL_SERVER + "member/address/update/{id}")
+    Observable<BaseResponse<Object>> updateAddress(@Path("id") int id, @Body EditAddressEntry body);
+
+    /**
+     * 删除地址
+     *
+     * @param id
+     * @return
+     */
+    @POST(MALL_PORTAL_SERVER + "member/address/delete/{id}")
+    Observable<BaseResponse<Object>> delAddress(@Path("id") int id);
 }

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/EditAddressPresenter.java → BaseLibrary/src/main/java/com/cooleshow/base/presenter/AddressListPresenter.java

@@ -1,30 +1,32 @@
-package com.cooleshow.teacher.presenter.mine;
+package com.cooleshow.base.presenter;
 
+import android.content.res.ObbInfo;
+
+import com.cooleshow.base.bean.AddressBean;
+import com.cooleshow.base.constanst.AddressListContract;
+import com.cooleshow.base.data.api.UploadApi;
 import com.cooleshow.base.data.net.ApiException;
-import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
-import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtil;
-import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
-import com.cooleshow.teacher.api.APIService;
-import com.cooleshow.teacher.contract.EditAddressContract;
+
+import java.util.List;
+
 
 /**
- * 创建日期：2022/5/18 10:20
+ * 创建日期：2022/5/17 15:23
  *
  * @author Ryan
  * 类说明：
  */
-public class EditAddressPresenter extends BasePresenter<EditAddressContract.EditAddressView> implements EditAddressContract.Presenter {
-
-    public void createNewAddress(String jsonStr) {
+public class AddressListPresenter extends BasePresenter<AddressListContract.AddressListView> implements AddressListContract.Presenter {
+    public void companyAddressList() {
         getView().showLoading();
-        addSubscribe(create(APIService.class).createNewAddress(RequestBodyUtil.convertToRequestBodyJson(jsonStr)), new BaseObserver<Object>(getView()) {
+        addSubscribe(create(UploadApi.class).companyAddressList(), new BaseObserver<List<AddressBean>>(getView()) {
             @Override
-            protected void onSuccess(Object data) {
+            protected void onSuccess(List<AddressBean> data) {
                 if (getView() != null) {
-                    getView().createNewAddressSuccess(data);
+                    getView().companyAddressListSuccess(data);
                 }
             }
 
@@ -33,7 +35,6 @@ public class EditAddressPresenter extends BasePresenter<EditAddressContract.Edit
                 super.onComplete();
                 getView().hideLoading();
             }
-
             @Override
             public void onError(Throwable e) {
                 super.onError(e);
@@ -46,13 +47,13 @@ public class EditAddressPresenter extends BasePresenter<EditAddressContract.Edit
         });
     }
 
-    public void updateAddress(int id,String jsonStr) {
+    public void delAddress(int id) {
         getView().showLoading();
-        addSubscribe(create(APIService.class).updateAddress(id,RequestBodyUtil.convertToRequestBodyJson(jsonStr)), new BaseObserver<Object>(getView()) {
+        addSubscribe(create(UploadApi.class).delAddress(id), new BaseObserver<Object>(getView()) {
             @Override
             protected void onSuccess(Object data) {
                 if (getView() != null) {
-                    getView().createNewAddressSuccess(data);
+                    getView().delAddress();
                 }
             }
 
@@ -61,7 +62,6 @@ public class EditAddressPresenter extends BasePresenter<EditAddressContract.Edit
                 super.onComplete();
                 getView().hideLoading();
             }
-
             @Override
             public void onError(Throwable e) {
                 super.onError(e);
@@ -73,5 +73,4 @@ public class EditAddressPresenter extends BasePresenter<EditAddressContract.Edit
             }
         });
     }
-
 }

student/src/main/java/com/cooleshow/student/presenter/mine/EditAddressPresenter.java → BaseLibrary/src/main/java/com/cooleshow/base/presenter/EditAddressPresenter.java

@@ -1,14 +1,16 @@
-package com.cooleshow.student.presenter.mine;
+package com.cooleshow.base.presenter;
 
+import android.icu.util.ULocale;
+
+import com.cooleshow.base.bean.request.EditAddressEntry;
+import com.cooleshow.base.constanst.EditAddressContract;
+import com.cooleshow.base.data.api.UploadApi;
 import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
+import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtil;
-import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.ErrorParse;
-import com.cooleshow.student.api.APIService;
-import com.cooleshow.student.contract.EditAddressContract;
 
 /**
  * 创建日期：2022/5/18 10:20
@@ -18,9 +20,9 @@ import com.cooleshow.student.contract.EditAddressContract;
  */
 public class EditAddressPresenter extends BasePresenter<EditAddressContract.EditAddressView> implements EditAddressContract.Presenter {
 
-    public void createNewAddress(String jsonStr) {
+    public void createNewAddress(EditAddressEntry entry) {
         getView().showLoading();
-        addSubscribe(create(APIService.class).createNewAddress(RequestBodyUtil.convertToRequestBodyJson(jsonStr)), new BaseObserver<Object>(getView()) {
+        addSubscribe(create(UploadApi.class).createNewAddress(entry), new BaseObserver<Object>(getView()) {
             @Override
             protected void onSuccess(Object data) {
                 if (getView() != null) {
@@ -46,9 +48,9 @@ public class EditAddressPresenter extends BasePresenter<EditAddressContract.Edit
         });
     }
 
-    public void updateAddress(int id,String jsonStr) {
+    public void updateAddress(int id,EditAddressEntry entry) {
         getView().showLoading();
-        addSubscribe(create(APIService.class).updateAddress(id,RequestBodyUtil.convertToRequestBodyJson(jsonStr)), new BaseObserver<Object>(getView()) {
+        addSubscribe(create(UploadApi.class).updateAddress(id,entry), new BaseObserver<Object>(getView()) {
             @Override
             protected void onSuccess(Object data) {
                 if (getView() != null) {

BaseLibrary/src/main/java/com/cooleshow/base/router/RouterPath.kt

@@ -44,7 +44,7 @@ object RouterPath {
             const val PATH_VERIFY_LOGIN = "/userCenter/verifyLogin"
             const val PATH_VERIFY_INPUT = "/userCenter/verifyInput"
             const val PATH_BIND_PASSWORD = "/userCenter/bindPwd"
-            const val COMMON_EMPTY_ACTIVITY="/userCenter/CommEmptyActivity"
+            const val COMMON_EMPTY_ACTIVITY = "/userCenter/CommEmptyActivity"
         }
     }
 
@@ -137,9 +137,6 @@ object RouterPath {
             const val MINE_MODIFY_PHONENUM = "/teacher/ui/mine/ModifyPhoneNumActivity"
             const val MINE_MODIFY_PASSWORD = "/teacher/ui/mine/ModifyPasswordActivity"
             const val MINE_PERSONAL_CERTIFICATION = "/teacher/ui/mine/PersonalCertificationActivity"
-            const val MINE_ADDRESS_LIST = "/teacher/ui/mine/AddressListActivity"
-            const val MINE_SELECT_ADDRESS_LIST = "/teacher/ui/mine/SelectAddressListActivity"
-            const val MINE_EDIT_ADDRESS = "/teacher/ui/mine/EditAddressActivity"
             const val MINE_ABOUT = "/teacher/ui/mine/AboutActivity"
             const val MINE_FEEDBACK = "/teacher/ui/mine/FeedBackActivity"
             const val MINE_MY_BANKCARD = "/teacher/ui/mine/MyBankCardActivity"
@@ -150,7 +147,6 @@ object RouterPath {
             const val MINE_NETWORK_MONITORING = "/ui/mine/NetworkMonitoringActivity"
             const val MINE_EQUIPMENT_TEST = "/ui/mine/EquipmentTestActivity"
             const val MINE_UNBIND_BANKCARD = "/teacher/ui/mine/UnBindBankCardActivity"
-
         }
     }
 
@@ -171,4 +167,12 @@ object RouterPath {
             const val CHAT_GROUP_JOIN_APPLY = "/rong/imkit/activity/JoinGroupApplyActivity"
         }
     }
+
+    class BaseCenter {
+        companion object {
+            const val MINE_ADDRESS_LIST = "/base/ui/AddressListActivity"
+            const val MINE_EDIT_ADDRESS = "/base/ui/EditAddressActivity"
+        }
+    }
+
 }

student/src/main/java/com/cooleshow/student/ui/mine/AddressListActivity.java → BaseLibrary/src/main/java/com/cooleshow/base/ui/activity/set/AddressListActivity.java

@@ -1,11 +1,8 @@
-package com.cooleshow.student.ui.mine;
+package com.cooleshow.base.ui.activity.set;
 
-import android.media.Image;
+import android.content.Intent;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -13,47 +10,49 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.R;
+import com.cooleshow.base.adapter.AddressListAdapter;
+import com.cooleshow.base.bean.AddressBean;
+import com.cooleshow.base.common.BaseConstant;
+import com.cooleshow.base.constanst.AddressListContract;
+import com.cooleshow.base.databinding.ActivityAddressListBinding;
+import com.cooleshow.base.presenter.AddressListPresenter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.EmptyViewLayout;
-import com.cooleshow.student.R;
-import com.cooleshow.student.adapter.AddressListAdapter;
-import com.cooleshow.student.bean.AddressBean;
-import com.cooleshow.student.contract.AddressListContract;
-import com.cooleshow.student.databinding.ActivityAddressListBinding;
-import com.cooleshow.student.presenter.mine.AddressListPresenter;
+import com.google.gson.Gson;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import io.rong.imkit.utils.StatusBarUtil;
-
 /**
  * 创建日期：2022/5/17 15:16
  *
  * @author Ryan
  * 类说明：
  */
-@Route(path = RouterPath.MineCenter.MINE_ADDRESS_LIST)
+@Route(path = RouterPath.BaseCenter.MINE_ADDRESS_LIST)
 public class AddressListActivity extends BaseMVPActivity<ActivityAddressListBinding, AddressListPresenter> implements AddressListContract.AddressListView, View.OnClickListener {
 
     private AddressListAdapter addressListAdapter;
+    private boolean mIsCheckAddress;
+    private int delPosition;
 
     @Override
     public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.tv_add:
-                ARouter.getInstance().build(RouterPath.MineCenter.MINE_EDIT_ADDRESS)
-                        .withBoolean("isAdd", true)
-                        .navigation();
-                break;
+        if (view.getId() == R.id.tv_add) {
+            ARouter.getInstance().build(RouterPath.BaseCenter.MINE_EDIT_ADDRESS)
+                    .withBoolean("isAdd", true)
+                    .navigation();
         }
     }
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
+        mIsCheckAddress = getIntent().getBooleanExtra(BaseConstant.CHECK_ADDRESS, false);
     }
 
     private List<AddressBean> dataList = new ArrayList<>();
@@ -68,11 +67,28 @@ public class AddressListActivity extends BaseMVPActivity<ActivityAddressListBind
         addressListAdapter = new AddressListAdapter(dataList);
         setEmptyView();
         rvAddress.setAdapter(addressListAdapter);
+        addressListAdapter.setDelClickListener(position -> {
+            delPosition = position;
+            AddressBean addressBean = dataList.get(position);
+            presenter.delAddress(addressBean.id);
+        });
+        addressListAdapter.setOnItemClickListener((adapter, view, position) -> {
+            if (mIsCheckAddress) {
+                return;
+            }
+            AddressBean item = (AddressBean) adapter.getItem(position);
+            Gson gson = new Gson();
+            String s = gson.toJson(item);
+            Intent intent = new Intent();
+            intent.putExtra("selectAddress", s);
+            setResult(RESULT_OK, intent);
+            finish();
+        });
     }
 
     private void setEmptyView() {
         EmptyViewLayout emptyView = new EmptyViewLayout(this);
-        emptyView.setContent(com.cooleshow.base.R.drawable.icon_empty_content,"暂无数据");
+        emptyView.setContent(com.cooleshow.base.R.drawable.icon_empty_content, "暂无数据");
         addressListAdapter.setEmptyView(emptyView);
     }
 
@@ -98,4 +114,10 @@ public class AddressListActivity extends BaseMVPActivity<ActivityAddressListBind
         dataList.addAll(data);
         addressListAdapter.notifyDataSetChanged();
     }
+
+    @Override
+    public void delAddress() {
+        dataList.remove(delPosition);
+        if (addressListAdapter != null) addressListAdapter.notifyItemRangeRemoved(delPosition, 1);
+    }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/mine/EditAddressActivity.java → BaseLibrary/src/main/java/com/cooleshow/base/ui/activity/set/EditAddressActivity.java

@@ -1,4 +1,4 @@
-package com.cooleshow.teacher.ui.mine;
+package com.cooleshow.base.ui.activity.set;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
@@ -18,35 +18,33 @@ import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
 import com.bigkoo.pickerview.listener.CustomListener;
 import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
 import com.bigkoo.pickerview.view.OptionsPickerView;
+import com.cooleshow.base.R;
+import com.cooleshow.base.bean.AddressBean;
 import com.cooleshow.base.bean.JsonBean;
+import com.cooleshow.base.bean.request.EditAddressEntry;
+import com.cooleshow.base.constanst.EditAddressContract;
+import com.cooleshow.base.databinding.ActivityEditAddressBinding;
+import com.cooleshow.base.presenter.EditAddressPresenter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GetJsonDataUtil;
 import com.cooleshow.base.utils.ToastUtil;
-import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.teacher.R;
-import com.cooleshow.teacher.bean.AddressBean;
-import com.cooleshow.teacher.contract.EditAddressContract;
-import com.cooleshow.teacher.databinding.ActivityEditAddressBinding;
-import com.cooleshow.teacher.presenter.mine.EditAddressPresenter;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.google.gson.Gson;
 
 import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import io.rong.imkit.utils.StatusBarUtil;
-
 /**
  * 创建日期：2022/5/18 9:47
  *
  * @author Ryan
  * 类说明：
  */
-@Route(path = RouterPath.MineCenter.MINE_EDIT_ADDRESS)
+@Route(path = RouterPath.BaseCenter.MINE_EDIT_ADDRESS)
 public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBinding, EditAddressPresenter> implements EditAddressContract.EditAddressView, View.OnClickListener {
 
     private String province;//省
@@ -58,88 +56,67 @@ public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBind
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
 
 
     @Override
     public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.im_set_default:
-                isDefaultAddress = !isDefaultAddress;
-                if (isDefaultAddress) {
-                    viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_open);
-                } else {
-                    viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_off);
-                }
-                break;
-            case R.id.tv_district_detail:
-                if (isLoaded) {
-                    showPickerView();
-                } else {
-                    ToastUtil.getInstance().showShort("数据加载中，请稍后重试！");
-                }
-                break;
-            case R.id.tv_save:
-                String name = viewBinding.etName.getText().toString().trim();
-                if (TextUtils.isEmpty(name)) {
-                    ToastUtil.getInstance().showShort("请输入姓名");
-                    break;
-                }
-                String phoneNumber = viewBinding.etPhone.getText().toString().trim();
-                if (TextUtils.isEmpty(phoneNumber)) {
-                    ToastUtil.getInstance().showShort("请输入收件人电话号码");
-                    break;
-                }
-                if (phoneNumber.length() != 11) {
-                    ToastUtil.getInstance().showShort("请输入正确电话号码");
-                    break;
-                }
-                if (TextUtils.isEmpty(province)) {
-                    ToastUtil.getInstance().showShort("请选择所在地区");
-                    break;
-                }
-                String detailAddress = viewBinding.etDetailAddress.getText().toString().trim();
-                if (TextUtils.isEmpty(detailAddress)) {
-                    ToastUtil.getInstance().showShort("请输入详细地址");
-                    break;
-                }
-
-                /*
-                	"city": "",
-	"defaultStatus": 0,
-	"detailAddress": "",
-	"id": 0,
-	"memberId": 0,
-	"name": "",
-	"phoneNumber": "",
-	"postCode": "",
-	"province": "",
-	"region": ""
-                 */
-                JSONObject jsonObject = new JSONObject();
-                try {
-                    jsonObject.putOpt("name", name);
-                    jsonObject.putOpt("phoneNumber", phoneNumber);
-                    jsonObject.putOpt("province", province);
-                    jsonObject.putOpt("city", city);
-                    jsonObject.putOpt("region", region);
-                    if (isDefaultAddress) {
-                        jsonObject.putOpt("defaultStatus", 1);
-                    } else {
-                        jsonObject.putOpt("defaultStatus", 0);
-                    }
-                    jsonObject.putOpt("detailAddress", detailAddress);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-                if (isAdd) {
-                    presenter.createNewAddress(jsonObject.toString());
-                } else {
-                    presenter.updateAddress(id, jsonObject.toString());
-                }
-
-                break;
+        int viewId = view.getId();
+        if (viewId == R.id.im_set_default) {
+            isDefaultAddress = !isDefaultAddress;
+            if (isDefaultAddress) {
+                viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_open);
+            } else {
+                viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_off);
+            }
+        } else if (viewId == R.id.tv_district_detail) {
+            if (isLoaded) {
+                showPickerView();
+            } else {
+                ToastUtil.getInstance().showShort("数据加载中，请稍后重试！");
+            }
+        } else if (viewId == R.id.tv_save) {
+            String name = viewBinding.etName.getText().toString().trim();
+            if (TextUtils.isEmpty(name)) {
+                ToastUtil.getInstance().showShort("请输入姓名");
+                return;
+            }
+            String phoneNumber = viewBinding.etPhone.getText().toString().trim();
+            if (TextUtils.isEmpty(phoneNumber)) {
+                ToastUtil.getInstance().showShort("请输入收件人电话号码");
+                return;
+            }
+            if (phoneNumber.length() != 11) {
+                ToastUtil.getInstance().showShort("请输入正确电话号码");
+                return;
+            }
+            if (TextUtils.isEmpty(province)) {
+                ToastUtil.getInstance().showShort("请选择所在地区");
+                return;
+            }
+            String detailAddress = viewBinding.etDetailAddress.getText().toString().trim();
+            if (TextUtils.isEmpty(detailAddress)) {
+                ToastUtil.getInstance().showShort("请输入详细地址");
+                return;
+            }
+            EditAddressEntry entry = new EditAddressEntry();
+            entry.name = name;
+            entry.phoneNumber = phoneNumber;
+            entry.province = province;
+            entry.city = city;
+            entry.region = region;
+            entry.detailAddress = detailAddress;
+            if (isDefaultAddress) {
+                entry.defaultStatus = 1;
+            } else {
+                entry.defaultStatus = 0;
+            }
+            if (isAdd) {
+                presenter.createNewAddress(entry);
+            } else {
+                presenter.updateAddress(id, entry);
+            }
         }
     }
 
@@ -171,7 +148,6 @@ public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBind
             }
             viewBinding.etDetailAddress.setText(addressBean.detailAddress);
             id = addressBean.id;
-
             isDefaultAddress = addressBean.defaultStatus == 1;//是否是默认地址
             if (addressBean.defaultStatus == 1) {
                 viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_open);
@@ -234,30 +210,17 @@ public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBind
                 viewBinding.tvDistrictDetail.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_1a1a1a));
             }
         })
-                .setLayoutRes(R.layout.pickerview_address_layout, new CustomListener() {
-                    @Override
-                    public void customLayout(View v) {
-                        //自定义布局中的控件初始化及事件处理
-                        final TextView tvSubmit = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_finish);
-                        TextView ivCancel = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_cancel);
-                        tvSubmit.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                pvOptions.returnData();
-                                pvOptions.dismiss();
-                            }
-                        });
-                        ivCancel.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                pvOptions.dismiss();
-                            }
-                        });
+                .setLayoutRes(R.layout.pickerview_address_layout, v -> {
+                    //自定义布局中的控件初始化及事件处理
+                    final TextView tvSubmit = (TextView) v.findViewById(R.id.tv_finish);
+                    TextView ivCancel = (TextView) v.findViewById(R.id.tv_cancel);
+                    tvSubmit.setOnClickListener(v12 -> {
+                        pvOptions.returnData();
+                        pvOptions.dismiss();
+                    });
+                    ivCancel.setOnClickListener(v1 -> pvOptions.dismiss());
 
-                    }
                 })
-//                .setLineSpacingMultiplier(2.5f)
-//                .setTextColorCenter(getResources().getColor(com.cooleshow.base.R.color.color_1a1a1a))//设置选中项的颜色
                 .isDialog(false)//是否显示为对话框样式
                 .build();
         pvOptions.setPicker(options1Items, options2Items, options3Items);//三级选择器
@@ -365,4 +328,5 @@ public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBind
         }
     };
 
+
 }

student/src/main/res/layout/activity_address_list.xml → BaseLibrary/src/main/res/layout/activity_address_list.xml

@@ -28,7 +28,7 @@
         android:layout_marginTop="27dp"
         android:layout_marginRight="28dp"
         android:layout_marginBottom="48dp"
-        android:background="@drawable/shape_course_status_ing"
+        android:background="@drawable/sure_btn_bg"
         android:gravity="center"
         android:text="添加新地址"
         android:textColor="@color/white"

student/src/main/res/layout/activity_edit_address.xml → BaseLibrary/src/main/res/layout/activity_edit_address.xml

@@ -227,7 +227,7 @@
         android:layout_marginTop="20dp"
         android:layout_marginRight="28dp"
         android:layout_marginBottom="36dp"
-        android:background="@drawable/shape_course_status_ing"
+        android:background="@drawable/sure_btn_bg"
         android:gravity="center"
         android:text="保存收货地址"
         android:textColor="@color/white"

teacher/src/main/res/layout/layout_address_item.xml → BaseLibrary/src/main/res/layout/layout_address_item.xml

@@ -49,19 +49,31 @@
         android:layout_width="@dimen/dp_38"
         android:layout_height="@dimen/dp_39"
         android:padding="@dimen/dp_10"
-        android:layout_marginRight="15dp"
+        android:layout_marginRight="@dimen/dp_10"
         android:src="@drawable/icon_modify_address"
         app:layout_constraintBottom_toBottomOf="@+id/tv_address"
+        app:layout_constraintRight_toLeftOf="@+id/im_del"
+        app:layout_constraintTop_toTopOf="@+id/tv_name" />
+
+    <ImageView
+        android:id="@+id/im_del"
+        android:layout_width="@dimen/dp_38"
+        android:layout_height="@dimen/dp_39"
+        android:layout_marginRight="@dimen/dp_10"
+        android:padding="@dimen/dp_10"
+        android:src="@mipmap/icon_del_address"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_address"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tv_name" />
+
     <View
         android:id="@+id/view_line"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginLeft="14dp"
-        android:layout_marginRight="14dp"
         android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@+id/tv_address"
-        android:background="@color/divide_color_f0f0f0"/>
+        android:layout_marginRight="14dp"
+        android:background="@color/divide_color_f0f0f0"
+        app:layout_constraintTop_toBottomOf="@+id/tv_address" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

BaseLibrary/src/main/res/layout/pickerview_address_layout.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_white_top_10dp"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp">
+
+
+        <TextView
+            android:id="@+id/tv_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="17dp"
+            android:text="取消"
+            android:textColor="@color/color_999999"
+            android:textSize="@dimen/dp_16" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text=""
+            android:textColor="@color/color_1a1a1a"
+            android:textSize="18dp" />
+
+        <TextView
+            android:id="@+id/tv_finish"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="17dp"
+            android:padding="8dp"
+            android:text="确定"
+            android:textColor="@color/colorPrimary"
+            android:textSize="@dimen/dp_16" />
+
+    </RelativeLayout>
+
+    <View style="@style/line_style" />
+    <!--此部分需要完整复制过去，删减或者更改ID会导致初始化找不到内容而报空-->
+    <LinearLayout
+        android:id="@+id/optionspicker"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_200"
+        android:background="#ffffff"
+        android:gravity="center"
+        android:minHeight="150dp"
+        android:orientation="horizontal">
+
+        <com.contrarywind.view.WheelView
+            android:id="@+id/options1"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <com.contrarywind.view.WheelView
+            android:id="@+id/options2"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <com.contrarywind.view.WheelView
+            android:id="@+id/options3"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+    </LinearLayout>
+
+
+</LinearLayout>

student/src/main/AndroidManifest.xml

@@ -67,18 +67,10 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.mine.AddressListActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="portrait" />
-        <activity
             android:name=".ui.mine.AboutActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.mine.EditAddressActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="portrait" />
-        <activity
             android:name=".ui.mine.PersonalSettingActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
@@ -205,10 +197,6 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".ui.mine.SelectAddressListActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="portrait" />
-        <activity
             android:name=".ui.mine.FeedBackActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />

student/src/main/java/com/cooleshow/student/adapter/AddressListAdapter.java

@@ -1,66 +0,0 @@
-package com.cooleshow.student.adapter;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.student.R;
-import com.cooleshow.student.bean.AddressBean;
-
-import java.util.List;
-
-/**
- * 创建日期：2022/5/17 15:32
- *
- * @author Ryan
- * 类说明：
- */
-public class AddressListAdapter extends BaseQuickAdapter<AddressBean, BaseViewHolder> {
-
-    public AddressListAdapter(List<AddressBean> data) {
-        super(R.layout.layout_address_item, data);
-    }
-
-
-    @Override
-    protected void convert(BaseViewHolder helper, AddressBean item) {
-        TextView tv_name=helper.getView(R.id.tv_name);
-        TextView tv_phone=helper.getView(R.id.tv_phone);
-        TextView tv_address=helper.getView(R.id.tv_address);
-        View view_line=helper.getView(R.id.view_line);
-        tv_name.setText(item.name);
-        String cPhone=item.phoneNumber;
-        if (item.phoneNumber.length()==11){
-            cPhone = item.phoneNumber.substring(0, 3) + "****" + item.phoneNumber.substring(7, item.phoneNumber.length());
-        }
-        tv_phone.setText(cPhone);
-        String addressDetail=item.province+item.city+item.region+item.detailAddress;
-        tv_address.setText(addressDetail);
-        if (getData().size()-1==getItemPosition(item)){
-            view_line.setVisibility(View.GONE);
-        }else {
-            view_line.setVisibility(View.VISIBLE);
-        }
-        ImageView im_modify = helper.getView(R.id.im_modify);
-        im_modify.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Bundle bundle = new Bundle();
-                bundle.putSerializable("AddressBean", item);
-
-                ARouter.getInstance().build(RouterPath.MineCenter.MINE_EDIT_ADDRESS)
-                        .withBoolean("isAdd",false)
-                        .withBundle("bundle",bundle)
-                        .navigation();
-            }
-        });
-
-    }
-
-
-}

student/src/main/java/com/cooleshow/student/api/APIService.java

@@ -76,33 +76,6 @@ public interface APIService {
     Observable<BaseResponse<StudentUserInfo>> queryUserInfo();
 
     /**
-     * 获取所有收货地址
-     *
-     * @return
-     */
-    @GET(MALL_PORTAL_SERVER + "member/address/list")
-    Observable<BaseResponse<List<AddressBean>>> companyAddressList();
-
-    /**
-     * 添加收货地址
-     *
-     * @param body
-     * @return
-     */
-    @POST(MALL_PORTAL_SERVER + "member/address/add")
-    Observable<BaseResponse<Object>> createNewAddress(@Body RequestBody body);
-
-    /**
-     * 修改地址
-     *
-     * @param id
-     * @param body
-     * @return
-     */
-    @POST(MALL_PORTAL_SERVER + "member/address/update/{id}")
-    Observable<BaseResponse<Object>> updateAddress(@Path("id") int id, @Body RequestBody body);
-
-    /**
      * 获取设置详情
      *
      * @return

student/src/main/java/com/cooleshow/student/presenter/mine/AddressListPresenter.java

@@ -1,48 +0,0 @@
-package com.cooleshow.student.presenter.mine;
-
-import com.cooleshow.base.data.net.ApiException;
-import com.cooleshow.base.presenter.BasePresenter;
-import com.cooleshow.base.rx.BaseObserver;
-import com.cooleshow.base.utils.ToastUtil;
-import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.ErrorParse;
-import com.cooleshow.student.api.APIService;
-import com.cooleshow.student.bean.AddressBean;
-import com.cooleshow.student.contract.AddressListContract;
-
-import java.util.List;
-
-/**
- * 创建日期：2022/5/17 15:23
- *
- * @author Ryan
- * 类说明：
- */
-public class AddressListPresenter extends BasePresenter<AddressListContract.AddressListView> implements AddressListContract.Presenter {
-    public void companyAddressList() {
-        getView().showLoading();
-        addSubscribe(create(APIService.class).companyAddressList(), new BaseObserver<List<AddressBean>>(getView()) {
-            @Override
-            protected void onSuccess(List<AddressBean> data) {
-                if (getView() != null) {
-                    getView().companyAddressListSuccess(data);
-                }
-            }
-
-            @Override
-            public void onComplete() {
-                super.onComplete();
-                getView().hideLoading();
-            }
-            @Override
-            public void onError(Throwable e) {
-                super.onError(e);
-                if (e instanceof ApiException) {
-                    ErrorParse.getInstance().parseError(e);
-                    ApiException apiException = (ApiException) e;
-                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
-                }
-            }
-        });
-    }
-}

student/src/main/java/com/cooleshow/student/ui/mine/EditAddressActivity.java

@@ -1,369 +0,0 @@
-package com.cooleshow.student.ui.mine;
-
-import android.annotation.SuppressLint;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-
-import com.alibaba.android.arouter.facade.annotation.Autowired;
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
-import com.bigkoo.pickerview.listener.CustomListener;
-import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
-import com.bigkoo.pickerview.view.OptionsPickerView;
-import com.cooleshow.base.bean.JsonBean;
-import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
-import com.cooleshow.base.utils.GetJsonDataUtil;
-import com.cooleshow.base.utils.ToastUtil;
-import com.cooleshow.base.utils.ToastUtils;
-
-import com.cooleshow.student.R;
-import com.cooleshow.student.bean.AddressBean;
-import com.cooleshow.student.contract.EditAddressContract;
-import com.cooleshow.student.databinding.ActivityEditAddressBinding;
-import com.cooleshow.student.presenter.mine.EditAddressPresenter;
-import com.google.gson.Gson;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.rong.imkit.utils.StatusBarUtil;
-
-/**
- * 创建日期：2022/5/18 9:47
- *
- * @author Ryan
- * 类说明：
- */
-@Route(path = RouterPath.MineCenter.MINE_EDIT_ADDRESS)
-public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBinding, EditAddressPresenter> implements EditAddressContract.EditAddressView, View.OnClickListener {
-
-    private String province;//省
-    private String city;//市
-    private String region;//区
-    private boolean isDefaultAddress;
-    private int id;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
-    }
-
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.im_set_default:
-                isDefaultAddress = !isDefaultAddress;
-                if (isDefaultAddress) {
-                    viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_open);
-                } else {
-                    viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_off);
-                }
-                break;
-            case R.id.tv_district_detail:
-                if (isLoaded) {
-                    showPickerView();
-                } else {
-                    ToastUtil.getInstance().showShort("数据加载中，请稍后重试！");
-                }
-                break;
-            case R.id.tv_save:
-                String name = viewBinding.etName.getText().toString().trim();
-                if (TextUtils.isEmpty(name)) {
-                    ToastUtil.getInstance().showShort("请输入姓名");
-                    break;
-                }
-                String phoneNumber = viewBinding.etPhone.getText().toString().trim();
-                if (TextUtils.isEmpty(phoneNumber)) {
-                    ToastUtil.getInstance().showShort("请输入收件人电话号码");
-                    break;
-                }
-                if (phoneNumber.length() != 11) {
-                    ToastUtil.getInstance().showShort("请输入正确电话号码");
-                    break;
-                }
-                if (TextUtils.isEmpty(province)) {
-                    ToastUtil.getInstance().showShort("请选择所在地区");
-                    break;
-                }
-                String detailAddress = viewBinding.etDetailAddress.getText().toString().trim();
-                if (TextUtils.isEmpty(detailAddress)) {
-                    ToastUtil.getInstance().showShort("请输入详细地址");
-                    break;
-                }
-
-                /*
-                	"city": "",
-	"defaultStatus": 0,
-	"detailAddress": "",
-	"id": 0,
-	"memberId": 0,
-	"name": "",
-	"phoneNumber": "",
-	"postCode": "",
-	"province": "",
-	"region": ""
-                 */
-                JSONObject jsonObject = new JSONObject();
-                try {
-                    jsonObject.putOpt("name", name);
-                    jsonObject.putOpt("phoneNumber", phoneNumber);
-                    jsonObject.putOpt("province", province);
-                    jsonObject.putOpt("city", city);
-                    jsonObject.putOpt("region", region);
-                    if (isDefaultAddress) {
-                        jsonObject.putOpt("defaultStatus", 1);
-                    } else {
-                        jsonObject.putOpt("defaultStatus", 0);
-                    }
-                    jsonObject.putOpt("detailAddress", detailAddress);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-                if (isAdd) {
-                    presenter.createNewAddress(jsonObject.toString());
-                } else {
-                    presenter.updateAddress(id, jsonObject.toString());
-                }
-
-                break;
-        }
-    }
-
-    @Autowired(name = "isAdd")
-    boolean isAdd;
-
-    @Autowired(name = "bundle")
-    Bundle myBundle;
-
-
-    @Override
-    protected void initView() {
-        ARouter.getInstance().inject(this);
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "编辑地址");
-        viewBinding.tvSave.setOnClickListener(this);
-        viewBinding.imSetDefault.setOnClickListener(this);
-        viewBinding.tvDistrictDetail.setOnClickListener(this);
-        mHandler.sendEmptyMessage(MSG_LOAD_DATA);
-        if (null != myBundle) {
-            AddressBean addressBean = (AddressBean) myBundle.getSerializable("AddressBean");
-            viewBinding.etName.setText(addressBean.name);
-            viewBinding.etPhone.setText(addressBean.phoneNumber);
-            if (!TextUtils.isEmpty(addressBean.province)) {
-                province = addressBean.province;
-                city = addressBean.city;
-                region = addressBean.region;
-                viewBinding.tvDistrictDetail.setText(addressBean.province + addressBean.city + addressBean.region);
-                viewBinding.tvDistrictDetail.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_1a1a1a));
-            }
-            viewBinding.etDetailAddress.setText(addressBean.detailAddress);
-            id = addressBean.id;
-            isDefaultAddress = addressBean.defaultStatus == 1;//是否是默认地址
-            if (addressBean.defaultStatus == 1) {
-                viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_open);
-            } else {
-                viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_off);
-            }
-        }
-    }
-
-    @Override
-    protected ActivityEditAddressBinding getLayoutView() {
-        return ActivityEditAddressBinding.inflate(getLayoutInflater());
-    }
-
-    @Override
-    protected EditAddressPresenter createPresenter() {
-        return new EditAddressPresenter();
-    }
-
-    @Override
-    public void createNewAddressSuccess(Object object) {
-        finish();
-    }
-
-
-    private List<JsonBean> options1Items = new ArrayList<>();
-    private ArrayList<ArrayList<String>> options2Items = new ArrayList<>();
-    private ArrayList<ArrayList<ArrayList<String>>> options3Items = new ArrayList<>();
-    private Thread thread;
-    private static final int MSG_LOAD_DATA = 0x0001;
-    private static final int MSG_LOAD_SUCCESS = 0x0002;
-    private static final int MSG_LOAD_FAILED = 0x0003;
-
-    private static boolean isLoaded = false;
-    private OptionsPickerView pvOptions;
-
-    private void showPickerView() {// 弹出选择器
-
-        pvOptions = new OptionsPickerBuilder(this, new OnOptionsSelectListener() {
-            @Override
-            public void onOptionsSelect(int options1, int options2, int options3, View v) {
-                //返回的分别是三个级别的选中位置
-                String opt1tx = options1Items.size() > 0 ?
-                        options1Items.get(options1).getPickerViewText() : "";
-
-                String opt2tx = options2Items.size() > 0
-                        && options2Items.get(options1).size() > 0 ?
-                        options2Items.get(options1).get(options2) : "";
-
-                String opt3tx = options2Items.size() > 0
-                        && options3Items.get(options1).size() > 0
-                        && options3Items.get(options1).get(options2).size() > 0 ?
-                        options3Items.get(options1).get(options2).get(options3) : "";
-
-                String tx = opt1tx + opt2tx + opt3tx;
-                province = opt1tx;
-                city = opt2tx;
-                region = opt3tx;
-                viewBinding.tvDistrictDetail.setText(tx);
-                viewBinding.tvDistrictDetail.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_1a1a1a));
-            }
-        })
-                .setLayoutRes(R.layout.pickerview_address_layout, new CustomListener() {
-                    @Override
-                    public void customLayout(View v) {
-                        //自定义布局中的控件初始化及事件处理
-                        final TextView tvSubmit = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_finish);
-                        TextView ivCancel = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_cancel);
-                        tvSubmit.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                pvOptions.returnData();
-                                pvOptions.dismiss();
-                            }
-                        });
-                        ivCancel.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                pvOptions.dismiss();
-                            }
-                        });
-
-                    }
-                })
-//                .setLineSpacingMultiplier(2.5f)
-//                .setTextColorCenter(getResources().getColor(com.cooleshow.base.R.color.color_1a1a1a))//设置选中项的颜色
-                .isDialog(false)//是否显示为对话框样式
-                .build();
-        pvOptions.setPicker(options1Items, options2Items, options3Items);//三级选择器
-        pvOptions.show();
-
-    }
-
-    private void initJsonData() {//解析数据
-
-        /**
-         * 注意：assets 目录下的Json文件仅供参考，实际使用可自行替换文件
-         * 关键逻辑在于循环体
-         *
-         * */
-        String JsonData = new GetJsonDataUtil().getJson(this, "province.json");//获取assets目录下的json文件数据
-
-        ArrayList<JsonBean> jsonBean = parseData(JsonData);//用Gson 转成实体
-
-        /**
-         * 添加省份数据
-         *
-         * 注意：如果是添加的JavaBean实体，则实体类需要实现 IPickerViewData 接口，
-         * PickerView会通过getPickerViewText方法获取字符串显示出来。
-         */
-        options1Items = jsonBean;
-
-        for (int i = 0; i < jsonBean.size(); i++) {//遍历省份
-            ArrayList<String> cityList = new ArrayList<>();//该省的城市列表（第二级）
-            ArrayList<ArrayList<String>> province_AreaList = new ArrayList<>();//该省的所有地区列表（第三极）
-
-            for (int c = 0; c < jsonBean.get(i).getCityList().size(); c++) {//遍历该省份的所有城市
-                String cityName = jsonBean.get(i).getCityList().get(c).getName();
-                cityList.add(cityName);//添加城市
-                ArrayList<String> city_AreaList = new ArrayList<>();//该城市的所有地区列表
-                //如果无地区数据，建议添加空字符串，防止数据为null 导致三个选项长度不匹配造成崩溃
-                if (jsonBean.get(i).getCityList().get(c).getArea() == null
-                        || jsonBean.get(i).getCityList().get(c).getArea().size() == 0) {
-                    city_AreaList.add("");
-                } else {
-                    city_AreaList.addAll(jsonBean.get(i).getCityList().get(c).getArea());
-                }
-                city_AreaList.addAll(jsonBean.get(i).getCityList().get(c).getArea());
-                province_AreaList.add(city_AreaList);//添加该省所有地区数据
-            }
-
-            /**
-             * 添加城市数据
-             */
-            options2Items.add(cityList);
-
-            /**
-             * 添加地区数据
-             */
-            options3Items.add(province_AreaList);
-        }
-
-        mHandler.sendEmptyMessage(MSG_LOAD_SUCCESS);
-
-    }
-
-
-    public ArrayList<JsonBean> parseData(String result) {//Gson 解析
-        ArrayList<JsonBean> detail = new ArrayList<>();
-        try {
-            JSONArray data = new JSONArray(result);
-            Gson gson = new Gson();
-            for (int i = 0; i < data.length(); i++) {
-                JsonBean entity = gson.fromJson(data.optJSONObject(i).toString(), JsonBean.class);
-                detail.add(entity);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            mHandler.sendEmptyMessage(MSG_LOAD_FAILED);
-        }
-        return detail;
-    }
-
-    @SuppressLint("HandlerLeak")
-    private Handler mHandler = new Handler() {
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_LOAD_DATA:
-                    if (thread == null) {//如果已创建就不再重新创建子线程了
-                        Log.e("asdkjhakdsfs", "Begin Parse Data");
-                        thread = new Thread(new Runnable() {
-                            @Override
-                            public void run() {
-                                // 子线程中解析省市区数据
-                                initJsonData();
-                            }
-                        });
-                        thread.start();
-                    }
-                    break;
-
-                case MSG_LOAD_SUCCESS:
-                    Log.e("asdkjhakdsfs", "Parse Succeed");
-                    isLoaded = true;
-                    break;
-
-                case MSG_LOAD_FAILED:
-                    Log.e("asdkjhakdsfs", "Parse Failed");
-                    break;
-            }
-        }
-    };
-
-
-}

student/src/main/java/com/cooleshow/student/ui/mine/SelectAddressListActivity.java

@@ -1,117 +0,0 @@
-package com.cooleshow.student.ui.mine;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.chad.library.adapter.base.listener.OnItemClickListener;
-import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
-import com.cooleshow.base.widgets.EmptyViewLayout;
-import com.cooleshow.student.R;
-import com.cooleshow.student.adapter.AddressListAdapter;
-import com.cooleshow.student.bean.AddressBean;
-import com.cooleshow.student.contract.AddressListContract;
-import com.cooleshow.student.databinding.ActivityAddressListBinding;
-import com.cooleshow.student.databinding.ActivitySelectAddressListBinding;
-import com.cooleshow.student.presenter.mine.AddressListPresenter;
-import com.google.gson.Gson;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.rong.imkit.utils.StatusBarUtil;
-
-/**
- * 创建日期：2022/6/9 10:39
- *
- * @author Ryan
- * 类说明：
- */
-@Route(path = RouterPath.MineCenter.MINE_SELECT_ADDRESS_LIST)
-public class SelectAddressListActivity extends BaseMVPActivity<ActivitySelectAddressListBinding, AddressListPresenter> implements AddressListContract.AddressListView, View.OnClickListener {
-
-    private AddressListAdapter addressListAdapter;
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.tv_add:
-                ARouter.getInstance().build(RouterPath.MineCenter.MINE_EDIT_ADDRESS)
-                        .withBoolean("isAdd", true)
-                        .navigation();
-                break;
-        }
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
-    }
-
-    private List<AddressBean> dataList = new ArrayList<>();
-
-    @Override
-    protected void initView() {
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "地址列表");
-        viewBinding.tvAdd.setOnClickListener(this);
-        RecyclerView rvAddress = viewBinding.rvAddress;
-        LinearLayoutManager manager = new LinearLayoutManager(this);
-        rvAddress.setLayoutManager(manager);
-        addressListAdapter = new AddressListAdapter(dataList);
-        setEmptyView();
-        rvAddress.setAdapter(addressListAdapter);
-        addressListAdapter.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
-                AddressBean item = (AddressBean) adapter.getItem(position);
-                Gson gson = new Gson();
-                String s = gson.toJson(item);
-                Intent intent = new Intent();
-                intent.putExtra("selectAddress", s);
-                setResult(RESULT_OK, intent);
-                finish();
-
-            }
-        });
-    }
-
-    private void setEmptyView() {
-        EmptyViewLayout emptyView = new EmptyViewLayout(this);
-        emptyView.setContent(com.cooleshow.base.R.drawable.icon_empty_content, "暂无数据");
-        addressListAdapter.setEmptyView(emptyView);
-    }
-
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        presenter.companyAddressList();
-    }
-
-    @Override
-    protected ActivitySelectAddressListBinding getLayoutView() {
-        return ActivitySelectAddressListBinding.inflate(getLayoutInflater());
-    }
-
-    @Override
-    protected AddressListPresenter createPresenter() {
-        return new AddressListPresenter();
-    }
-
-    @Override
-    public void companyAddressListSuccess(List<AddressBean> data) {
-        dataList.clear();
-        dataList.addAll(data);
-        addressListAdapter.notifyDataSetChanged();
-    }
-}

student/src/main/java/com/cooleshow/student/ui/mine/SettingActivity.java

@@ -8,6 +8,7 @@ import androidx.annotation.Nullable;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.common.BaseConstant;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
@@ -35,7 +36,8 @@ public class SettingActivity extends BaseMVPActivity<ActivitySettingBinding, Set
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.cl_address:
-                ARouter.getInstance().build(RouterPath.MineCenter.MINE_ADDRESS_LIST)
+                ARouter.getInstance().build(RouterPath.BaseCenter.MINE_ADDRESS_LIST)
+                        .withBoolean(BaseConstant.CHECK_ADDRESS,true)
                         .navigation();
                 break;
             case R.id.im_select:

student/src/main/java/com/cooleshow/student/widgets/helper/JsInterfaceAccomPanyUtils.java

@@ -295,7 +295,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
                     }
                 } else if ("setAddress".equals(api)) {
                     //跳转地址页面
-                    ARouter.getInstance().build(RouterPath.MineCenter.MINE_SELECT_ADDRESS_LIST)
+                    ARouter.getInstance().build(RouterPath.BaseCenter.MINE_ADDRESS_LIST)
                             .navigation(activity, 1011);
                 } else if ("paymentOrder".equals(api)) {
                     //支付

student/src/main/java/com/cooleshow/student/widgets/helper/JsInterfaceUtils.java

@@ -227,7 +227,7 @@ public class JsInterfaceUtils extends Object {
                 }
                 //跳转地址页面
                 if ("setAddress".equals(api)) {
-                    ARouter.getInstance().build(RouterPath.MineCenter.MINE_SELECT_ADDRESS_LIST)
+                    ARouter.getInstance().build(RouterPath.BaseCenter.MINE_ADDRESS_LIST)
                             .navigation(activity, 1011);
                 }
                 //支付

student/src/main/res/layout/layout_address_item.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tool="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="10dp">
-
-    <TextView
-        android:id="@+id/tv_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="14dp"
-        android:text="--"
-        android:textColor="@color/color_1a1a1a"
-        android:textSize="@dimen/sp_18"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tool:text="李姗姗" />
-
-    <TextView
-        android:id="@+id/tv_phone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="17dp"
-        android:text="--"
-        android:textColor="@color/color_666666"
-        android:textSize="@dimen/sp_16"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_name"
-        app:layout_constraintLeft_toRightOf="@+id/tv_name"
-        app:layout_constraintTop_toTopOf="@+id/tv_name"
-        tool:text="132****3455" />
-
-    <TextView
-        android:id="@+id/tv_address"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="14dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginRight="30dp"
-        android:textColor="@color/color_666666"
-        android:textSize="@dimen/sp_16"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_name"
-        tool:text="湖北省武汉市汉街总部" />
-
-    <ImageView
-        android:id="@+id/im_modify"
-        android:layout_width="@dimen/dp_38"
-        android:layout_height="@dimen/dp_39"
-        android:padding="@dimen/dp_10"
-        android:layout_marginRight="15dp"
-        android:src="@drawable/icon_modify_address"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_address"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/tv_name" />
-    <View
-        android:id="@+id/view_line"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginLeft="14dp"
-        android:layout_marginRight="14dp"
-        android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@+id/tv_address"
-        android:background="@color/divide_color_f0f0f0"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

teacher/src/main/AndroidManifest.xml

@@ -156,10 +156,6 @@
             android:name=".ui.mine.PersonalCertificationActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.mine.AddressListActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="portrait" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -174,10 +170,6 @@
         </provider>
 
         <activity
-            android:name=".ui.mine.EditAddressActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="portrait" />
-        <activity
             android:name=".ui.mine.AboutActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
@@ -282,10 +274,6 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.mine.SelectAddressListActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="portrait" />
-        <activity
             android:name=".ui.live.TeacherLiveRoomActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:exported="false"

teacher/src/main/java/com/cooleshow/teacher/adapter/MineLiveCourseAdapter.java

@@ -1,5 +1,6 @@
 package com.cooleshow.teacher.adapter;
 
+import android.text.TextUtils;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -45,7 +46,7 @@ public class MineLiveCourseAdapter extends BaseQuickAdapter<MineLiveCourseListBe
         TextView tv_student_count=helper.getView(R.id.tv_student_count);
         tv_student_count.setText(item.studentCount+"人已购买");
         TextView tv_date=helper.getView(R.id.tv_date);
-        tv_date.setText(TimeUtils.date2String(TimeUtils.string2Date(item.courseStartTime),"yyyy-MM-dd HH:mm"));
+        tv_date.setText(TextUtils.isEmpty(item.courseStartTime)?"":TimeUtils.date2String(TimeUtils.string2Date(item.courseStartTime),"yyyy-MM-dd HH:mm"));
         TextView tv_price=helper.getView(R.id.tv_price);
         tv_price.setText("￥"+item.coursePrice+"/"+item.courseNum+"课时");
         helper.setText(R.id.subject_name,item.subjectName);

teacher/src/main/java/com/cooleshow/teacher/adapter/MineLiveCourseListAdapter.java

@@ -11,6 +11,7 @@ import com.chad.library.adapter.base.module.BaseLoadMoreModule;
 import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.cooleshow.base.utils.GlideUtils;
+import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.MineLiveCourseListBean;
@@ -20,7 +21,7 @@ import com.cooleshow.teacher.constants.CourseConstants;
  * 创建日期：2022/6/17 15:45
  *
  * @author Ryan
- * 类说明：
+ * 类说明：个人主页-直播课
  */
 public class MineLiveCourseListAdapter extends BaseQuickAdapter<MineLiveCourseListBean.RowsBean, com.chad.library.adapter.base.viewholder.BaseViewHolder> implements LoadMoreModule {
 
@@ -30,8 +31,11 @@ public class MineLiveCourseListAdapter extends BaseQuickAdapter<MineLiveCourseLi
 
     @Override
     protected void convert(@NonNull BaseViewHolder holder, MineLiveCourseListBean.RowsBean data) {
+        if (data == null) {
+            return;
+        }
         //时间
-        holder.setText(R.id.tv_time, data.courseStartTime);
+        holder.setText(R.id.tv_time, TextUtils.isEmpty(data.courseStartTime) ? "" : TimeUtils.date2String(TimeUtils.string2Date(data.courseStartTime), "yyyy-MM-dd HH:mm"));
         //title
         holder.setText(R.id.tv_title, data.courseGroupName);
         //subjectName
@@ -42,26 +46,10 @@ public class MineLiveCourseListAdapter extends BaseQuickAdapter<MineLiveCourseLi
         ImageView iv_avatar = holder.getView(R.id.iv_bg);
         GlideUtils.INSTANCE.loadImage(getContext(), data.backgroundPic, iv_avatar, R.drawable.icon_teacher_default_head);
         GlideUtils.INSTANCE.loadImage(getContext(), data.avatar, holder.getView(R.id.teacher_head), R.drawable.icon_teacher_default_head);
-        holder.setText(R.id.teacher_name,data.teacherName);
+        holder.setText(R.id.teacher_name, data.teacherName);
         TextView tvCourseStatusBt = holder.getView(R.id.tv_course_status);
-
-        if (TextUtils.equals(CourseConstants.COURSE_STATUS_NOT_START, data.status)) {
-            //未开始
-            holder.setText(R.id.tv_course_status, "未开始");
-            tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff802c));
-        }
-
-        if (TextUtils.equals(CourseConstants.COURSE_STATUS_ING, data.status)) {
-            //进行中
-            holder.setText(R.id.tv_course_status, "进行中");
-            tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
-        }
-
-        if (TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, data.status)) {
-            //已结束
-            holder.setText(R.id.tv_course_status, "已结束");
-            tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_999999));
-        }
+        tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
+        tvCourseStatusBt.setText("￥"+data.coursePrice+"/"+data.courseNum+"课时");
     }
 
     @NonNull

teacher/src/main/java/com/cooleshow/teacher/api/APIService.java

@@ -8,7 +8,7 @@ import com.cooleshow.teacher.bean.request.CommentHomeWorkEntry;
 import com.cooleshow.teacher.bean.request.LiveCourseEntry;
 import com.cooleshow.teacher.bean.AccountDetailBean;
 import com.cooleshow.teacher.bean.AccountTotalBean;
-import com.cooleshow.teacher.bean.AddressBean;
+import com.cooleshow.base.bean.AddressBean;
 import com.cooleshow.teacher.bean.CountOfUnreadBean;
 import com.cooleshow.teacher.bean.CourseCommentListBean;
 import com.cooleshow.teacher.bean.CourseTableDataBean;
@@ -45,7 +45,6 @@ import com.cooleshow.teacher.bean.WithdrawalInfoBean;
 import com.cooleshow.teacher.bean.WithdrawalRecordBean;
 import com.cooleshow.teacher.bean.request.QueryGroupListEntry;
 import com.cooleshow.teacher.bean.request.SheetMusicEntry;
-import com.cooleshow.teacher.bean.request.SysSuggestionEntry;
 import com.cooleshow.teacher.bean.request.TeacherPracticeCourseEntry;
 import com.cooleshow.teacher.bean.request.UnBindCardEntry;
 import com.cooleshow.usercenter.bean.SetDetailBean;
@@ -420,33 +419,6 @@ public interface APIService {
     Observable<BaseResponse<Object>> realNameAuth(@Body RequestBody body);
 
     /**
-     * 获取所有收货地址
-     *
-     * @return
-     */
-    @GET(MALL_PORTAL_SERVER + "member/address/list")
-    Observable<BaseResponse<List<AddressBean>>> companyAddressList();
-
-    /**
-     * 添加收货地址
-     *
-     * @param body
-     * @return
-     */
-    @POST(MALL_PORTAL_SERVER + "member/address/add")
-    Observable<BaseResponse<Object>> createNewAddress(@Body RequestBody body);
-
-    /**
-     * 修改地址
-     *
-     * @param id
-     * @param body
-     * @return
-     */
-    @POST(MALL_PORTAL_SERVER + "member/address/update/{id}")
-    Observable<BaseResponse<Object>> updateAddress(@Path("id") int id, @Body RequestBody body);
-
-    /**
      * 意见反馈
      *
      * @param body

teacher/src/main/java/com/cooleshow/teacher/bean/MineLiveCourseListBean.java

@@ -48,7 +48,7 @@ public class MineLiveCourseListBean {
         public String courseGroupName;
         public String courseIntroduce;
         public int  courseNum;
-        public double coursePrice;
+        public String coursePrice;
         public String courseStartTime;
         public int existBuy;
         public String imGroupId;

teacher/src/main/java/com/cooleshow/teacher/contract/AddressListContract.java

@@ -1,7 +1,7 @@
 package com.cooleshow.teacher.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
-import com.cooleshow.teacher.bean.AddressBean;
+import com.cooleshow.base.bean.AddressBean;
 
 import java.util.List;
 

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/AddressListPresenter.java

@@ -1,48 +0,0 @@
-package com.cooleshow.teacher.presenter.mine;
-
-import com.cooleshow.base.data.net.ApiException;
-import com.cooleshow.base.presenter.BasePresenter;
-import com.cooleshow.base.rx.BaseObserver;
-import com.cooleshow.base.utils.ToastUtil;
-import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.ErrorParse;
-import com.cooleshow.teacher.api.APIService;
-import com.cooleshow.teacher.bean.AddressBean;
-import com.cooleshow.teacher.contract.AddressListContract;
-
-import java.util.List;
-
-/**
- * 创建日期：2022/5/17 15:23
- *
- * @author Ryan
- * 类说明：
- */
-public class AddressListPresenter extends BasePresenter<AddressListContract.AddressListView> implements AddressListContract.Presenter {
-    public void companyAddressList() {
-        getView().showLoading();
-        addSubscribe(create(APIService.class).companyAddressList(), new BaseObserver<List<AddressBean>>(getView()) {
-            @Override
-            protected void onSuccess(List<AddressBean> data) {
-                if (getView() != null) {
-                    getView().companyAddressListSuccess(data);
-                }
-            }
-
-            @Override
-            public void onComplete() {
-                super.onComplete();
-                getView().hideLoading();
-            }
-            @Override
-            public void onError(Throwable e) {
-                super.onError(e);
-                if (e instanceof ApiException) {
-                    ErrorParse.getInstance().parseError(e);
-                    ApiException apiException = (ApiException) e;
-                    ToastUtil.getInstance().showShort(apiException.getErrmsg());
-                }
-            }
-        });
-    }
-}

teacher/src/main/java/com/cooleshow/teacher/ui/mine/AddressListActivity.java

@@ -1,96 +0,0 @@
-package com.cooleshow.teacher.ui.mine;
-
-import android.os.Bundle;
-import android.view.View;
-
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
-import com.cooleshow.base.widgets.EmptyViewLayout;
-import com.cooleshow.teacher.R;
-import com.cooleshow.teacher.adapter.AddressListAdapter;
-import com.cooleshow.teacher.bean.AddressBean;
-import com.cooleshow.teacher.contract.AddressListContract;
-import com.cooleshow.teacher.databinding.ActivityAddressListBinding;
-import com.cooleshow.teacher.presenter.mine.AddressListPresenter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.rong.imkit.utils.StatusBarUtil;
-
-/**
- * 创建日期：2022/5/17 15:16
- *
- * @author Ryan
- * 类说明：
- */
-@Route(path = RouterPath.MineCenter.MINE_ADDRESS_LIST)
-public class AddressListActivity extends BaseMVPActivity<ActivityAddressListBinding, AddressListPresenter> implements AddressListContract.AddressListView, View.OnClickListener {
-
-    private AddressListAdapter addressListAdapter;
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.tv_add:
-                ARouter.getInstance().build(RouterPath.MineCenter.MINE_EDIT_ADDRESS)
-                        .withBoolean("isAdd",true)
-                        .navigation();
-                break;
-        }
-    }
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
-    }
-
-    private List<AddressBean> dataList = new ArrayList<>();
-
-    @Override
-    protected void initView() {
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "地址列表");
-        viewBinding.tvAdd.setOnClickListener(this);
-        RecyclerView rvAddress = viewBinding.rvAddress;
-        LinearLayoutManager manager = new LinearLayoutManager(this);
-        rvAddress.setLayoutManager(manager);
-        addressListAdapter = new AddressListAdapter(dataList);
-        setEmptyView();
-        rvAddress.setAdapter(addressListAdapter);
-    }
-
-    private void setEmptyView() {
-        EmptyViewLayout emptyView = new EmptyViewLayout(this);
-        emptyView.setContent(com.cooleshow.base.R.drawable.icon_empty_content,"暂无数据");
-        addressListAdapter.setEmptyView(emptyView);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        presenter.companyAddressList();
-    }
-
-    @Override
-    protected ActivityAddressListBinding getLayoutView() {
-        return ActivityAddressListBinding.inflate(getLayoutInflater());
-    }
-
-    @Override
-    protected AddressListPresenter createPresenter() {
-        return new AddressListPresenter();
-    }
-
-    @Override
-    public void companyAddressListSuccess(List<AddressBean> data) {
-        dataList.clear();
-        dataList.addAll(data);
-        addressListAdapter.notifyDataSetChanged();
-    }
-}

teacher/src/main/java/com/cooleshow/teacher/ui/mine/SelectAddressListActivity.java

@@ -1,114 +0,0 @@
-package com.cooleshow.teacher.ui.mine;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.chad.library.adapter.base.listener.OnItemClickListener;
-import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
-import com.cooleshow.base.widgets.EmptyViewLayout;
-import com.cooleshow.teacher.R;
-import com.cooleshow.teacher.adapter.AddressListAdapter;
-import com.cooleshow.teacher.bean.AddressBean;
-import com.cooleshow.teacher.contract.AddressListContract;
-import com.cooleshow.teacher.databinding.ActivitySelectAddressListBinding;
-import com.cooleshow.teacher.presenter.mine.AddressListPresenter;
-import com.google.gson.Gson;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.rong.imkit.utils.StatusBarUtil;
-
-/**
- * 创建日期：2022/6/9 10:39
- *
- * @author Ryan
- * 类说明：
- */
-@Route(path = RouterPath.MineCenter.MINE_SELECT_ADDRESS_LIST)
-public class SelectAddressListActivity extends BaseMVPActivity<ActivitySelectAddressListBinding, AddressListPresenter> implements AddressListContract.AddressListView, View.OnClickListener {
-
-    private AddressListAdapter addressListAdapter;
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.tv_add:
-                ARouter.getInstance().build(RouterPath.MineCenter.MINE_EDIT_ADDRESS)
-                        .withBoolean("isAdd",true)
-                        .navigation();
-                break;
-        }
-    }
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
-    }
-
-    private List<AddressBean> dataList = new ArrayList<>();
-
-    @Override
-    protected void initView() {
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "地址列表");
-        viewBinding.tvAdd.setOnClickListener(this);
-        RecyclerView rvAddress = viewBinding.rvAddress;
-        LinearLayoutManager manager = new LinearLayoutManager(this);
-        rvAddress.setLayoutManager(manager);
-        addressListAdapter = new AddressListAdapter(dataList);
-        rvAddress.setAdapter(addressListAdapter);
-        setEmptyView();
-        addressListAdapter.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
-                AddressBean item = (AddressBean) adapter.getItem(position);
-                Gson gson=new Gson();
-                String s = gson.toJson(item);
-                Intent intent=new Intent();
-                intent.putExtra("selectAddress",s);
-                setResult(RESULT_OK,intent);
-                finish();
-
-            }
-        });
-    }
-
-    private void setEmptyView() {
-        EmptyViewLayout emptyView = new EmptyViewLayout(this);
-        emptyView.setContent(com.cooleshow.base.R.drawable.icon_empty_content,"暂无数据");
-        addressListAdapter.setEmptyView(emptyView);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        presenter.companyAddressList();
-    }
-
-    @Override
-    protected ActivitySelectAddressListBinding getLayoutView() {
-        return ActivitySelectAddressListBinding.inflate(getLayoutInflater());
-    }
-
-    @Override
-    protected AddressListPresenter createPresenter() {
-        return new AddressListPresenter();
-    }
-
-    @Override
-    public void companyAddressListSuccess(List<AddressBean> data) {
-        dataList.clear();
-        dataList.addAll(data);
-        addressListAdapter.notifyDataSetChanged();
-    }
-}

teacher/src/main/java/com/cooleshow/teacher/ui/mine/SettingActivity.java

@@ -8,6 +8,7 @@ import androidx.annotation.Nullable;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.common.BaseConstant;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
@@ -35,7 +36,8 @@ public class SettingActivity extends BaseMVPActivity<ActivitySettingBinding, Set
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.cl_address:
-                ARouter.getInstance().build(RouterPath.MineCenter.MINE_ADDRESS_LIST)
+                ARouter.getInstance().build(RouterPath.BaseCenter.MINE_ADDRESS_LIST)
+                        .withBoolean(BaseConstant.CHECK_ADDRESS,true)
                         .navigation();
                 break;
             case R.id.im_select:

teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceAccomPanyUtils.java

@@ -295,7 +295,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
                     }
                 } else if ("setAddress".equals(api)) {
                     //跳转地址页面
-                    ARouter.getInstance().build(RouterPath.MineCenter.MINE_SELECT_ADDRESS_LIST)
+                    ARouter.getInstance().build(RouterPath.BaseCenter.MINE_ADDRESS_LIST)
                             .navigation(activity, 1011);
                 } else if ("paymentOrder".equals(api)) {
                     //支付

teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceUtils.java

@@ -251,7 +251,7 @@ public class JsInterfaceUtils extends Object {
                 }
                 //跳转地址页面
                 if ("setAddress".equals(api)) {
-                    ARouter.getInstance().build(RouterPath.MineCenter.MINE_SELECT_ADDRESS_LIST)
+                    ARouter.getInstance().build(RouterPath.BaseCenter.MINE_ADDRESS_LIST)
                             .navigation(activity, 1011);
                     return;
                 }

teacher/src/main/res/layout/activity_address_list.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/color_f6f8f9"
-    android:orientation="vertical">
-
-    <include
-        android:id="@+id/toolbar_include"
-        layout="@layout/common_toolbar_layout" />
-
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_address"
-        android:layout_below="@+id/toolbar_include"
-        android:layout_width="match_parent"
-        android:layout_marginTop="15dp"
-        android:layout_above="@+id/tv_add"
-        android:layout_height="wrap_content"/>
-
-    <TextView
-        android:id="@+id/tv_add"
-        android:layout_width="match_parent"
-        android:layout_height="44dp"
-        android:layout_alignParentBottom="true"
-        android:layout_marginLeft="28dp"
-        android:layout_marginTop="27dp"
-        android:layout_marginRight="28dp"
-        android:layout_marginBottom="48dp"
-        android:background="@drawable/shape_course_status_ing"
-        android:gravity="center"
-        android:text="添加新地址"
-        android:textColor="@color/white"
-        android:textSize="@dimen/sp_14" />
-</RelativeLayout>

teacher/src/main/res/layout/activity_edit_address.xml

@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/color_f6f8f9">
-
-    <include
-        android:id="@+id/toolbar_include"
-        layout="@layout/common_toolbar_layout" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/toolbar_include"
-        android:layout_marginLeft="14dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="14dp"
-        android:background="@drawable/bg_white_10dp">
-
-        <TextView
-            android:id="@+id/tv_name"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_58"
-            android:layout_marginLeft="12dp"
-            android:paddingTop="@dimen/dp_20"
-            android:text="收货人"
-            android:textColor="@color/color_1a1a1a"
-            android:textSize="@dimen/sp_16"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <EditText
-            android:id="@+id/et_name"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_58"
-            android:layout_marginLeft="96dp"
-            android:layout_marginRight="14dp"
-            android:background="@null"
-            android:gravity="left"
-            android:hint="请输入姓名"
-            android:inputType="text"
-            android:paddingTop="@dimen/dp_20"
-            android:textColor="@color/color_1a1a1a"
-            android:textColorHint="@color/color_999999"
-            android:textSize="@dimen/sp_16"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_name"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tv_name" />
-
-
-        <View
-            android:id="@+id/view_line1"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginLeft="11dp"
-            android:layout_marginRight="9dp"
-            android:background="@color/color_f2f2f2"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_name" />
-
-
-        <TextView
-            android:id="@+id/tv_phone"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginLeft="12dp"
-            android:paddingTop="12dp"
-            android:text="联系电话"
-            android:textColor="@color/color_1a1a1a"
-            android:textSize="@dimen/sp_16"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/view_line1" />
-
-        <EditText
-            android:id="@+id/et_phone"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginLeft="96dp"
-            android:layout_marginRight="14dp"
-            android:background="@null"
-            android:gravity="left"
-            android:hint="收件人电话号码"
-            android:inputType="phone"
-            android:maxLength="11"
-            android:paddingTop="12dp"
-            android:textColor="@color/color_1a1a1a"
-            android:textColorHint="@color/color_999999"
-            android:textSize="@dimen/sp_16"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_phone"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tv_phone" />
-
-
-        <View
-            android:id="@+id/view_line2"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginLeft="11dp"
-            android:layout_marginRight="9dp"
-            android:background="@color/color_f2f2f2"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_phone" />
-
-
-        <TextView
-            android:id="@+id/tv_district"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginLeft="12dp"
-            android:paddingTop="12dp"
-            android:text="所在地区"
-            android:textColor="@color/color_1a1a1a"
-            android:textSize="@dimen/sp_16"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/view_line2" />
-
-        <TextView
-            android:id="@+id/tv_district_detail"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginLeft="96dp"
-            android:paddingTop="12dp"
-            android:text="请选择"
-            android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp_16"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_district"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tv_district" />
-
-        <ImageView
-            android:layout_width="12dp"
-            android:layout_height="7dp"
-            android:layout_marginLeft="5dp"
-            android:background="@drawable/icon_go_down"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_district_detail"
-            app:layout_constraintLeft_toRightOf="@+id/tv_district_detail"
-            app:layout_constraintTop_toTopOf="@+id/tv_district_detail" />
-
-        <View
-            android:id="@+id/view_line3"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginLeft="11dp"
-            android:layout_marginRight="9dp"
-            android:background="@color/color_f2f2f2"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_district" />
-
-        <TextView
-            android:id="@+id/tv_detail_address"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_98"
-            android:layout_marginLeft="12dp"
-            android:paddingTop="12dp"
-            android:text="详细地址"
-            android:textColor="@color/color_1a1a1a"
-            android:textSize="@dimen/sp_16"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/view_line3" />
-
-
-        <EditText
-            android:id="@+id/et_detail_address"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_98"
-            android:layout_marginLeft="96dp"
-            android:layout_marginRight="14dp"
-            android:background="@null"
-            android:gravity="left"
-            android:hint="请输入"
-            android:inputType="text"
-            android:paddingTop="12dp"
-            android:textColor="@color/color_1a1a1a"
-            android:textColorHint="@color/color_999999"
-            android:textSize="@dimen/sp_16"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/view_line3" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_set"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/cl_info"
-        android:layout_marginLeft="14dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginRight="14dp"
-        android:background="@drawable/bg_white_10dp">
-
-        <TextView
-            android:id="@+id/tv_default_set"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_52"
-            android:layout_marginLeft="12dp"
-            android:gravity="center"
-            android:text="设置为默认地址"
-            android:textColor="@color/color_1a1a1a"
-            android:textSize="@dimen/sp_16"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/im_set_default"
-            android:layout_width="@dimen/dp_47"
-            android:layout_height="@dimen/dp_44"
-            android:layout_marginRight="14dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:src="@drawable/icon_switch_off"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_default_set"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tv_default_set" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-    <TextView
-        android:id="@+id/tv_save"
-        android:layout_width="match_parent"
-        android:layout_height="44dp"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="bottom"
-        android:layout_marginLeft="28dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="28dp"
-        android:layout_marginBottom="36dp"
-        android:background="@drawable/shape_course_status_ing"
-        android:gravity="center"
-        android:text="保存收货地址"
-        android:textColor="@color/white"
-        android:textSize="@dimen/sp_14" />
-
-</RelativeLayout>

teacher/src/main/res/layout/activity_select_address_list.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/color_f6f8f9"
-    android:orientation="vertical">
-
-    <include
-        android:id="@+id/toolbar_include"
-        layout="@layout/common_toolbar_layout" />
-
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_address"
-        android:layout_below="@+id/toolbar_include"
-        android:layout_width="match_parent"
-        android:layout_marginTop="15dp"
-        android:layout_marginBottom="80dp"
-        android:layout_height="wrap_content"/>
-
-    <TextView
-        android:id="@+id/tv_add"
-        android:layout_width="match_parent"
-        android:layout_height="44dp"
-        android:layout_alignParentBottom="true"
-        android:layout_marginLeft="28dp"
-        android:layout_marginTop="27dp"
-        android:layout_marginRight="28dp"
-        android:layout_marginBottom="48dp"
-        android:background="@drawable/shape_course_status_ing"
-        android:gravity="center"
-        android:text="添加新地址"
-        android:textColor="@color/white"
-        android:textSize="@dimen/sp_14" />
-</RelativeLayout>

teacher/src/main/res/layout/item_live_course_list_layout.xml

@@ -162,5 +162,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         tools:text="调课" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>