Skip to content

M
magicbox
Commit f01baad9 authored by 王雪伟's avatar 王雪伟
Browse files
Options

[提交人]：王雪伟 

[提交简述] ：上传项目
[实现方案] ：修改地址
parent 48207d67
Hide whitespace changes
Inline Side-by-side
Showing with 84402 additions and 277 deletions
cms/src/main/res/values-zh-rCN/strings.xml deleted 100644 → 0
View file @ 48207d67
<resources>
<string name="app_name">幸运魔盒</string>
<string name="login_faild">登录失败</string>
<string name="login_success">登录成功</string>
<string name="reset_success">修改成功</string>
<string name="upload_success">上传成功</string>
<string name="login_ing">正在登录中</string>
<string name="auth_ing">授权中</string>
<string name="upload_ing">上传中,请稍后</string>
<string name="wait_ing">请稍后</string>
<string name="get_sms_code_success">验证码已发送</string>
<string name="nav_back_again_finish">再按一次退出程序</string>
<string name="album_not_available">请检查系统相册是否可用</string>
<string name="permission_help">帮助</string>
<string name="permission_help_text">手机号码极速寻人定位缺少必要权限：\n\n%s\n请点击"设置"-"权限"-打开所需权限。\n最后点击两次后退按钮，即可返回。</string>
<string name="permission_camera_help_text">此功能需要权限：\n\n%s\n请点击"设置"-"权限"-打开所需权限。</string>
<string name="permission_quit">退出</string>
<string name="permission_setting">设置</string>
<string name="permission_sdcard_str">访问sdcard权限\n</string>
<string name="permission_address_str">访问通讯录权限\n</string>
<string name="permission_camera_str">相机权限\n</string>
<string name="permission_phone_str">读取电话的状态权限\n</string>
<string name="permission_soarse_location_str">访问范围性的定位权限\n</string>
<string name="permission_fine_location_str">访问精良的定位权限\n</string>
<string name="customer_service">客服</string>
//仓库
<string name="time_limit">限时</string>
<string name="immediate_recycling">立即回收</string>
<string name="take_delivery">立即提货</string>
<string name="to_be_picked_up">待提货</string>
<string name="recycled">已回收</string>
<string name="to_be_recycled">待回收</string>
<string name="finished">已完成</string>
<string name="make_sure_recycle">确定回收</string>
<string name="recycle_desc">回收选中商品可得</string>
<string name="recycle_desc2">可在商城兑换超值商品</string>
//订单
<string name="shop_order">商城订单</string>
<string name="magic_box_order">魔盒订单</string>
//底部
<string name="shop">商城</string>
<string name="box">盲盒</string>
<string name="recycle_center">回收中心</string>
<string name="mine">我的</string>
<string name="ware_house">仓库</string>
<!--魔盒商品详情-->
<string name="box_detail_open_box_money_unit">¥</string>
<string name="box_detail_open_box_num">已有%1$s人开盒</string>
<string name="box_detail_open_box_tips">100%中奖&amp;100%公正</string>
<string name="box_detail_open_box_rule">规则</string>
<string name="box_detail_open_box_test_play">试玩</string>
<string name="box_detail_open_box_re_pumping">重抽卡</string>
<string name="box_detail_open_box_shop_pool">商品池</string>
<string name="box_detail_open_box_one_lottery_btn">一发入魂</string>
<string name="box_detail_open_box_five_lottery_btn">五连绝世</string>
<string name="box_detail_open_box_shop_pool_tips">爆率按商品等级划分</string>
<string name="box_detail_open_box_bottom_desc">到我的底线咯～</string>
<string name="box_detail_open_box_shop_pool_gailv">概率%1$s</string>
<string name="box_detail_open_box_result_btn_happy">开心收下</string>
<string name="box_detail_open_box_result_btn_try">试试手气</string>
<string name="box_detail_open_box_result_btn_konw">我知道了</string>
<string name="box_detail_open_box_result_btn_one_again">一发入魂</string>
<string name="box_detail_open_box_result_btn_five_again">再来五发</string>
<string name="box_detail_open_box_result_btn_receive">立即收下</string>
<string name="box_detail_open_box_result_re_pumping_desc">抽到商品不满意?点击使用重抽卡</string>
<string name="box_detail_open_box_result_re_pumping_desc2">对抽到商品不满意，使用重抽卡可重新抽取盲盒</string>
<string name="box_detail_open_box_result_re_pumping_desc3">恭喜您获得重抽卡，下次抽盒\n即可使用</string>
<string name="box_detail_open_box_result_re_pumping_desc4">使用重抽卡可免费重新开箱</string>
<string name="box_detail_open_box_result_try_play_desc">该商品为试玩结果，仅供参考</string>
<!--充值-->
<string name="pay_title">充值幸运币</string>
<string name="pay_coin_balance">金币余额</string>
<string name="pay_record">充值记录</string>
<string name="pay_button">立即充值</string>
<string name="pay_wechat">微信支付</string>
<string name="pay_zfb">支付宝支付</string>
<string name="pay_need_desc">本次所需：</string>
</resources>
cms/src/main/res/values/strings.xml
View file @ f01baad9
...@@ -26,42 +26,42 @@ ...@@ -26,42 +26,42 @@
<string name="permission_fine_location_str">访问精良的定位权限\n</string> <string name="permission_fine_location_str">访问精良的定位权限\n</string>
<string name="customer_service">customer service</string> <string name="customer_service">customer service</string>
//仓库 //仓库
<string name="time_limit">限时</string> <string name="time_limit">Limited time offer</string>
<string name="immediate_recycling">立即回收</string> <string name="immediate_recycling">Recycle</string>
<string name="take_delivery">立即提货</string> <string name="take_delivery">Deliver</string>
<string name="to_be_picked_up">待提货</string> <string name="to_be_picked_up">待提货</string>
<string name="recycled">已回收</string> <string name="recycled">Recycled</string>
<string name="to_be_recycled">待回收</string> <string name="to_be_recycled">My Goods</string>
<string name="finished">已完成</string> <string name="finished">已完成</string>
<string name="make_sure_recycle">确定回收</string> <string name="make_sure_recycle">Confirm</string>
<string name="recycle_desc">回收选中商品可得</string> <string name="recycle_desc">Reclaim the good you selected for</string>
<string name="recycle_desc2">可在商城兑换超值商品</string> <string name="recycle_desc2">You can exchange high-value goods</string>
//订单 <!--订单-->
<string name="shop_order">商城订单</string> <string name="shop_order">商城订单</string>
<string name="magic_box_order">魔盒订单</string> <string name="magic_box_order">魔盒订单</string>
//底部 <!--底部-->
<string name="shop">商城</string> <string name="shop">Mall</string>
<string name="box">盲盒</string> <string name="box">Boxes</string>
<string name="recycle_center">回收中心</string> <string name="recycle_center">Recycle</string>
<string name="mine">我的</string> <string name="mine">Account</string>
<string name="ware_house">仓库</string> <string name="ware_house">Warehouse</string>
<!--魔盒商品详情--> <!--魔盒商品详情-->
<string name="box_detail_open_box_money_unit">¥</string> <string name="box_detail_open_box_money_unit">$</string>
<string name="box_detail_open_box_num">已有%1$s人开盒</string> <string name="box_detail_open_box_num">opened %1$s times</string>
<string name="box_detail_open_box_tips">100%中奖&amp;100%公正</string> <string name="box_detail_open_box_tips">FAIRNESS GUARANTEED</string>
<string name="box_detail_open_box_rule">规则</string> <string name="box_detail_open_box_rule">Rule</string>
<string name="box_detail_open_box_test_play">试玩</string> <string name="box_detail_open_box_test_play">TRY FOR FREE</string>
<string name="box_detail_open_box_re_pumping">重抽卡</string> <string name="box_detail_open_box_re_pumping">重抽卡</string>
<string name="box_detail_open_box_shop_pool">商品池</string> <string name="box_detail_open_box_shop_pool">Items in this box</string>
<string name="box_detail_open_box_one_lottery_btn">一发入魂</string> <string name="box_detail_open_box_one_lottery_btn">Open</string>
<string name="box_detail_open_box_five_lottery_btn">五连绝世</string> <string name="box_detail_open_box_five_lottery_btn">Open 5x</string>
<string name="box_detail_open_box_shop_pool_tips">爆率按商品等级划分</string> <string name="box_detail_open_box_shop_pool_tips">爆率按商品等级划分</string>
<string name="box_detail_open_box_bottom_desc">到我的底线咯～</string> <string name="box_detail_open_box_bottom_desc">到我的底线咯～</string>
<string name="box_detail_open_box_shop_pool_gailv">概率%1$s</string> <string name="box_detail_open_box_shop_pool_gailv">概率%1$s</string>
<string name="box_detail_open_box_result_btn_happy">开心收下</string> <string name="box_detail_open_box_result_btn_happy">开心收下</string>
<string name="box_detail_open_box_result_btn_try">试试手气</string> <string name="box_detail_open_box_result_btn_try">试试手气</string>
<string name="box_detail_open_box_result_btn_konw">我知道了</string> <string name="box_detail_open_box_result_btn_konw">我知道了</string>
<string name="box_detail_open_box_result_btn_one_again">一发入魂</string> <string name="box_detail_open_box_result_btn_one_again">Open</string>
<string name="box_detail_open_box_result_btn_five_again">再来五发</string> <string name="box_detail_open_box_result_btn_five_again">再来五发</string>
<string name="box_detail_open_box_result_btn_receive">立即收下</string> <string name="box_detail_open_box_result_btn_receive">立即收下</string>
<string name="box_detail_open_box_result_re_pumping_desc">抽到商品不满意?点击使用重抽卡</string> <string name="box_detail_open_box_result_re_pumping_desc">抽到商品不满意?点击使用重抽卡</string>
...@@ -79,4 +79,22 @@ ...@@ -79,4 +79,22 @@
<string name="pay_zfb">支付宝支付</string> <string name="pay_zfb">支付宝支付</string>
<string name="pay_need_desc">本次所需：</string> <string name="pay_need_desc">本次所需：</string>
<!-- 填写地址-->
<string name="ShippingAddress">Shipping address</string>
<string name="Name">Name</string>
<string name="Phone">Phone</string>
<string name="Address1">Address1</string>
<string name="Address2">Address2</string>
<string name="Country">Country</string>
<string name="City">City</string>
<string name="Province">Province</string>
<string name="SetAsTheDefaultAddress">Set as the default address</string>
<string name="PleaseFillInYourProvince">Please fill in your province</string>
<string name="Please_select">Please select</string>
<string name="Please_fill_in_your_address2">Please fill in your address2</string>
<string name="Please_fill_in_your_address1">Please fill in your address1</string>
<string name="Please_fill_in_your_phone_number">Please fill in your phone number</string>
<string name="Please_fill_in_your_first_name">Please fill in your first name/last name/…</string>
<string name="Add">Add</string>
</resources> </resources>
moduleMain/src/main/assets/address.json 0 → 100644
View file @ f01baad9
This source diff could not be displayed because it is too large. You can view the blob instead.
moduleMain/src/main/java/com/zxhl/main/page/activity/EditAddressActivity.kt
View file @ f01baad9
...@@ -4,42 +4,39 @@ import android.Manifest ...@@ -4,42 +4,39 @@ import android.Manifest
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.database.Cursor import android.database.Cursor
import android.graphics.Color
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.provider.ContactsContract import android.provider.ContactsContract
import android.text.InputFilter
import android.text.TextUtils import android.text.TextUtils
import android.util.Log
import android.view.View import android.view.View
import android.widget.Toast import android.widget.Toast
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.bigkoo.pickerview.builder.OptionsPickerBuilder
import com.bigkoo.pickerview.view.OptionsPickerView
import com.google.gson.Gson import com.google.gson.Gson
import com.zxhl.cms.AppContext import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseActivity import com.zxhl.cms.common.base.BaseActivity
import com.zxhl.cms.net.model.box.AddressEntity import com.zxhl.cms.net.model.box.AddressEntity
import com.zxhl.cms.utils.GetJsonDataUtil import com.zxhl.cms.utils.GetJsonDataUtil
import com.zxhl.cms.utils.SpaceFilter
import com.zxhl.cms.utils.Utils import com.zxhl.cms.utils.Utils
import com.zxhl.main.R import com.zxhl.main.R
import com.zxhl.main.page.contract.EditAddressContract import com.zxhl.main.page.contract.EditAddressContract
import com.zxhl.main.page.entity.AddressBean
import com.zxhl.main.page.entity.JsonBean import com.zxhl.main.page.entity.JsonBean
import com.zxhl.main.page.presenter.EditAddressPresenter import com.zxhl.main.page.presenter.EditAddressPresenter
import kotlinx.android.synthetic.main.activity_layout_edit_address.* import kotlinx.android.synthetic.main.activity_layout_edit_address.*
import org.json.JSONArray import org.json.JSONArray
import org.json.JSONObject
import java.util.*
import kotlin.collections.ArrayList
class EditAddressActivity : BaseActivity(), EditAddressContract.View { class EditAddressActivity : BaseActivity(), EditAddressContract.View {
private var enity: AddressEntity? = null private var enity: AddressEntity? = null
private var mPresenter: EditAddressPresenter? = null private var mPresenter: EditAddressPresenter? = null
private var defaultAddress: String = "0" private var defaultAddress: String = "0"
private var options1Items: ArrayList<JsonBean> = ArrayList() //省
private val options2Items: ArrayList<ArrayList<String>> = ArrayList() //市 private var addressList: ArrayList<AddressBean> = ArrayList() //地址
private val options3Items: ArrayList<ArrayList<ArrayList<String>>> = ArrayList() //区
override fun onClick(v: View?) { override fun onClick(v: View?) {
...@@ -55,13 +52,14 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View { ...@@ -55,13 +52,14 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View {
} }
override fun init() { override fun init() {
initJsonData() initCityData()
var username = intent?.data?.getQueryParameter("username") ?: "" var username = intent?.data?.getQueryParameter("username") ?: ""
var mobile = intent?.data?.getQueryParameter("mobile") ?: "" var mobile = intent?.data?.getQueryParameter("mobile") ?: ""
var region = intent?.data?.getQueryParameter("region") ?: "" var region = intent?.data?.getQueryParameter("region") ?: ""
var address = intent?.data?.getQueryParameter("address") ?: "" var address = intent?.data?.getQueryParameter("address") ?: ""
var id = intent?.data?.getQueryParameter("id") ?: "" var id = intent?.data?.getQueryParameter("id") ?: ""
// id_edit_phone.setFilters(arrayOf<InputFilter>(SpaceFilter())) // id_edit_phone.setFilters(arrayOf<InputFilter>(SpaceFilter()))
defaultAddress = intent?.data?.getQueryParameter("defaultAddress") ?: "" defaultAddress = intent?.data?.getQueryParameter("defaultAddress") ?: ""
if (defaultAddress.equals("0")) { if (defaultAddress.equals("0")) {
id_img_moren.setImageResource(R.drawable.icon_guan) id_img_moren.setImageResource(R.drawable.icon_guan)
...@@ -69,7 +67,7 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View { ...@@ -69,7 +67,7 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View {
id_img_moren.setImageResource(R.drawable.icon_kai) id_img_moren.setImageResource(R.drawable.icon_kai)
} }
id_img_moren?.setOnClickListener { id_img_moren?.setOnClickListener {
if (defaultAddress.equals("0")) { if (defaultAddress == "0") {
defaultAddress = "1" defaultAddress = "1"
id_img_moren.setImageResource(R.drawable.icon_kai) id_img_moren.setImageResource(R.drawable.icon_kai)
} else { } else {
...@@ -77,31 +75,32 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View { ...@@ -77,31 +75,32 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View {
id_img_moren.setImageResource(R.drawable.icon_guan) id_img_moren.setImageResource(R.drawable.icon_guan)
} }
} }
id_tv_choose_city?.setOnClickListener {
id_select_city?.setOnClickListener {
hideKeyBoard() hideKeyBoard()
showPickerView()
} }
id_edit_name?.setText(username) id_edit_name?.setText(username)
id_edit_phone?.setText(mobile) id_edit_phone?.setText(mobile)
id_tv_choose_city?.setText(region) id_select_country?.text = addressList[0].country
id_edit_address?.setText(address) id_select_city?.text = addressList[0].cityLis?.get(0)
id_edit_address1?.setText(address)
id_img_back?.setOnClickListener { id_img_back?.setOnClickListener {
finish() finish()
} }
mPresenter = EditAddressPresenter(this) mPresenter = EditAddressPresenter(this)
id_tv_tongxulu?.setOnClickListener { // id_tv_tongxulu?.setOnClickListener {
checkPersion() // checkPersion()
//
} // }
id_tv_save_address?.setOnClickListener { id_tv_save_address?.setOnClickListener {
if (TextUtils.isEmpty(id_edit_name.text.toString()) || TextUtils.isEmpty(id_edit_phone.text.toString()) || TextUtils.isEmpty( if (TextUtils.isEmpty(id_edit_name.text.toString()) || TextUtils.isEmpty(id_edit_phone.text.toString()) || TextUtils.isEmpty(
id_tv_choose_city.text.toString() id_select_city.text.toString()
) || TextUtils.isEmpty(id_edit_address.text.toString()) ) || TextUtils.isEmpty(id_select_country.text.toString())
) { ) {
Utils.showToast(AppContext.get(), "请完整填写信息") Utils.showToast(AppContext.get(), "请完整填写信息")
return@setOnClickListener return@setOnClickListener
} else { } else {
if(id_edit_phone.text.toString()?.length!=11){ if (id_edit_phone.text.toString()?.length != 11) {
Utils.showToast(AppContext.get(), "请检查手机号码") Utils.showToast(AppContext.get(), "请检查手机号码")
return@setOnClickListener return@setOnClickListener
} }
...@@ -111,8 +110,8 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View { ...@@ -111,8 +110,8 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View {
} }
enity?.username = id_edit_name.text.toString().trim() enity?.username = id_edit_name.text.toString().trim()
enity?.mobile = id_edit_phone.text.toString().trim() enity?.mobile = id_edit_phone.text.toString().trim()
enity?.region = id_tv_choose_city.text.toString().trim() enity?.region = id_select_city.text.toString().trim()
enity?.address = id_edit_address.text.toString().trim() enity?.address = id_select_city.text.toString().trim()
enity?.defaultAddress = "1" enity?.defaultAddress = "1"
mPresenter?.editAddress(enity) mPresenter?.editAddress(enity)
} }
...@@ -120,36 +119,6 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View { ...@@ -120,36 +119,6 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View {
} }
} }
fun showPickerView() {
val pvOptions: OptionsPickerView<*> = OptionsPickerBuilder(
this
) { options1, options2, options3, v -> //返回的分别是三个级别的选中位置
id_tv_choose_city.setText(
options1Items[options1].pickerViewText
+ options2Items[options1][options2]
+ options3Items[options1][options2][options3]
)
}
.setTitleText("城市选择")
.setSubmitColor(resources.getColor(R.color.color_333333))
.setTitleBgColor(Color.WHITE)
.setCancelColor(resources.getColor(R.color.color_333333))//取消按钮文字颜色
.setDividerColor(resources.getColor(R.color.color_ededed))
.setTextColorCenter(Color.BLACK) //设置选中项文字颜色
.setContentTextSize(20)
.build<Any>()
/*pvOptions.setPicker(options1Items);//一级选择器
pvOptions.setPicker(options1Items, options2Items);//二级选择器*/
/*pvOptions.setPicker(options1Items);//一级选择器
pvOptions.setPicker(options1Items, options2Items);//二级选择器*/
pvOptions.setPicker(
options1Items as List<Nothing>?,
options2Items as List<Nothing>?, options3Items as List<Nothing>?
) //三级选择器
pvOptions.show()
}
fun checkPersion() { fun checkPersion() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
...@@ -218,7 +187,7 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View { ...@@ -218,7 +187,7 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View {
val uri: Uri? = data.data val uri: Uri? = data.data
val contacts: Array<String?>? = getPhoneContacts(uri!!) val contacts: Array<String?>? = getPhoneContacts(uri!!)
id_edit_name.setText(contacts?.get(0)) id_edit_name.setText(contacts?.get(0))
id_edit_phone.setText(contacts?.get(1).toString().replace(" ","")) id_edit_phone.setText(contacts?.get(1).toString().replace(" ", ""))
} }
} }
super.onActivityResult(requestCode, resultCode, data) super.onActivityResult(requestCode, resultCode, data)
...@@ -283,48 +252,32 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View { ...@@ -283,48 +252,32 @@ class EditAddressActivity : BaseActivity(), EditAddressContract.View {
return detail return detail
} }
private fun initJsonData() { //解析数据 （省市区三级联动）
/**
* 注意：assets 目录下的Json文件仅供参考，实际使用可自行替换文件
* 关键逻辑在于循环体
*
*/
val JsonData = GetJsonDataUtil().getJson(this, "province.json") //获取assets目录下的json文件数据
val jsonBean = parseData(JsonData) //用Gson 转成实体
/**
* 添加省份数据
*
* 注意：如果是添加的JavaBean实体，则实体类需要实现 IPickerViewData 接口，
* PickerView会通过getPickerViewText方法获取字符串显示出来。
*/
options1Items = jsonBean!!
for (i in 0 until jsonBean.size) { //遍历省份
val CityList: ArrayList<String> = ArrayList() //该省的城市列表（第二级）
val Province_AreaList: ArrayList<ArrayList<String>> = ArrayList() //该省的所有地区列表（第三级）
for (c in 0 until jsonBean[i].cityList.size) { //遍历该省份的所有城市
val CityName = jsonBean[i].cityList[c].name
CityList.add(CityName) //添加城市
val City_AreaList: ArrayList<String> = ArrayList() //该城市的所有地区列表
//如果无地区数据，建议添加空字符串，防止数据为null 导致三个选项长度不匹配造成崩溃 private fun initCityData() {
if (jsonBean[i].cityList[c].area == null Log.d("wxw", "start")
|| jsonBean[i].cityList[c].area.size === 0 //获取assets目录下的地址json文件数据
) { val addressJson = GetJsonDataUtil().getJson(this, "address.json")
City_AreaList.add("")
} else { val addressObj = JSONObject(addressJson)
City_AreaList.addAll(jsonBean[i].cityList[c].area) //通过迭代器获取这段json当中所有的key值
val keys = addressObj.keys()
//然后通过一个循环取出所有的key值
while (keys.hasNext()) {
val key = keys.next()
val value: JSONArray? = addressObj.optJSONArray(key)
var addressBean = AddressBean()
addressBean.country = key
var cityList = ArrayList<String>(value?.length() ?: 0)
if (value != null && value.length() > 0) {
for (index in 0 until value.length()) {
cityList.add(value.getString(index))
} }
Province_AreaList.add(City_AreaList) //添加该省所有地区数据
} }
/** addressBean.cityLis = cityList
* 添加城市数据 addressList.add(addressBean)
*/
options2Items.add(CityList)
/**
* 添加地区数据
*/
options3Items.add(Province_AreaList)
} }
Log.d("wxw", "end" + addressList.size)
} }
} }
\ No newline at end of file
moduleMain/src/main/java/com/zxhl/main/page/entity/AddressBean.kt 0 → 100644
View file @ f01baad9
package com.zxhl.main.page.entity
import com.zxhl.main.page.entity.JsonBean.CityBean
/**
* @author (wangXuewei)
* @datetime 2022-03-08 16:30 GMT+8
* @detail :
*/
class AddressBean {
var country: String? = null
var cityLis: ArrayList<String>? = null
}
\ No newline at end of file
moduleMain/src/main/java/com/zxhl/main/page/entity/AllAddressBean.java 0 → 100644
View file @ f01baad9
package com.zxhl.main.page.entity;
/**
* @author (wangXuewei)
* @datetime 2022-03-08 16:15 GMT+8
* @detail :
*/
public class AllAddressBean {
}
moduleMain/src/main/res/layout/activity_layout_edit_address.xml
View file @ f01baad9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#F6F6F6" android:background="#F8F8F8"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
<RelativeLayout <RelativeLayout
...@@ -24,8 +24,9 @@ ...@@ -24,8 +24,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="新增收货地址" android:text="@string/ShippingAddress"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
...@@ -34,8 +35,9 @@ ...@@ -34,8 +35,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/id_rl_edit_address_title" android:layout_below="@+id/id_rl_edit_address_title"
android:orientation="vertical"> android:orientation="vertical"
android:paddingLeft="15dp">
<!--姓名-->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
...@@ -44,42 +46,31 @@ ...@@ -44,42 +46,31 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="60dp" android:layout_width="80dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="15dp" android:gravity="center_vertical"
android:text="收货人" android:text="@string/Name"
android:textColor="@color/color_333333" /> android:textColor="@color/color_333333"
android:textSize="15sp"
android:textStyle="bold" />
<EditText <EditText
android:id="@+id/id_edit_name" android:id="@+id/id_edit_name"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@null" android:background="@null"
android:cursorVisible="true" android:cursorVisible="true"
android:ellipsize="end" android:ellipsize="end"
android:hint="请填写收货人姓名" android:hint="@string/Please_fill_in_your_first_name"
android:padding="10dp"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textColorHint="#B0B0B0" android:textColorHint="#B0B0B0"
android:textCursorDrawable="@null" android:textCursorDrawable="@null"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView
android:id="@+id/id_tv_tongxulu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginRight="20dp"
android:drawableLeft="@drawable/icon_tongxunlu"
android:drawablePadding="5dp"
android:text="通讯录"
android:textColor="@color/color_999999"
android:textSize="12sp" />
</LinearLayout> </LinearLayout>
<!--电话-->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
...@@ -88,33 +79,31 @@ ...@@ -88,33 +79,31 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="60dp" android:layout_width="80dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="15dp" android:gravity="center_vertical"
android:text="手机号码" android:text="@string/Phone"
android:textColor="@color/color_333333" /> android:textColor="@color/color_333333"
android:textSize="15sp"
android:textStyle="bold" />
<EditText <EditText
android:id="@+id/id_edit_phone" android:id="@+id/id_edit_phone"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@null" android:background="@null"
android:cursorVisible="true" android:cursorVisible="true"
android:ellipsize="end" android:ellipsize="end"
android:hint="请填写收货人手机号" android:hint="@string/Please_fill_in_your_phone_number"
android:inputType="number"
android:maxLength="11"
android:padding="10dp"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textColorHint="#B0B0B0" android:textColorHint="#B0B0B0"
android:textCursorDrawable="@null" android:textCursorDrawable="@null"
android:textSize="15sp" /> android:textSize="13sp" />
</LinearLayout> </LinearLayout>
<!--地址1-->
<LinearLayout <LinearLayout
android:id="@+id/id_ll_chosse_city" android:id="@+id/id_ll_chosse_city"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -124,45 +113,120 @@ ...@@ -124,45 +113,120 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="60dp" android:layout_width="80dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="15dp" android:gravity="center_vertical"
android:text="所在地区" android:text="@string/Address1"
android:textColor="@color/color_333333" /> android:textColor="@color/color_333333"
android:textSize="15sp"
android:textStyle="bold" />
<TextView <EditText
android:id="@+id/id_tv_choose_city" android:id="@+id/id_edit_address1"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@null"
android:cursorVisible="true"
android:ellipsize="end" android:ellipsize="end"
android:hint="省市县、乡镇等" android:hint="@string/Please_fill_in_your_address1"
android:padding="10dp" android:singleLine="true"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textColorHint="#B0B0B0" android:textColorHint="#B0B0B0"
android:textSize="15sp" /> android:textCursorDrawable="@null"
android:textSize="13sp" />
</LinearLayout>
<!--地址2-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="80dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/Address2"
android:textColor="@color/color_333333"
android:textSize="15sp"
android:textStyle="bold" />
<EditText <EditText
android:id="@+id/id_edit_region" android:id="@+id/id_edit_address2"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@null" android:background="@null"
android:cursorVisible="true" android:cursorVisible="true"
android:ellipsize="end" android:ellipsize="end"
android:hint="省市县、乡镇等" android:hint="@string/Please_fill_in_your_address2"
android:padding="10dp"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textColorHint="#B0B0B0" android:textColorHint="#B0B0B0"
android:textCursorDrawable="@null" android:textCursorDrawable="@null"
android:textSize="13sp" />
</LinearLayout>
<!--国家-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="80dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/Country"
android:textColor="@color/color_333333"
android:textSize="15sp" android:textSize="15sp"
android:visibility="gone" /> android:textStyle="bold" />
<TextView
android:id="@+id/id_select_country"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:hint="@string/Please_select"
android:textColorHint="#B0B0B0"
android:textColor="@color/color_333333"
android:textSize="13sp" />
</LinearLayout> </LinearLayout>
<!--城市-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="80dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/City"
android:textColor="@color/color_333333"
android:textSize="15sp"
android:textStyle="bold" />
<TextView
android:id="@+id/id_select_city"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:hint="@string/Please_select"
android:textColorHint="#B0B0B0"
android:textColor="@color/color_333333"
android:textSize="13sp" />
</LinearLayout>
<!--填写省市-->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
...@@ -171,31 +235,31 @@ ...@@ -171,31 +235,31 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="60dp" android:layout_width="80dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="15dp" android:gravity="center_vertical"
android:text="详细地址" android:text="@string/Province"
android:textColor="@color/color_333333" /> android:textColor="@color/color_333333"
android:textSize="15sp"
android:textStyle="bold" />
<EditText <EditText
android:id="@+id/id_edit_address" android:id="@+id/id_edit_province"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@null" android:background="@null"
android:cursorVisible="true" android:cursorVisible="true"
android:ellipsize="end" android:ellipsize="end"
android:hint="精确到小区门牌号" android:hint="@string/PleaseFillInYourProvince"
android:padding="10dp"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textColorHint="#B0B0B0" android:textColorHint="#B0B0B0"
android:textCursorDrawable="@null" android:textCursorDrawable="@null"
android:textSize="15sp" /> android:textSize="13sp" />
</LinearLayout> </LinearLayout>
<!--默认地址-->
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
...@@ -205,10 +269,10 @@ ...@@ -205,10 +269,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="15dp" android:text="@string/SetAsTheDefaultAddress"
android:text="设置默认地址"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="15sp" /> android:textSize="15sp"
android:textStyle="bold" />
<ImageView <ImageView
android:id="@+id/id_img_moren" android:id="@+id/id_img_moren"
...@@ -216,7 +280,7 @@ ...@@ -216,7 +280,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="20dp" android:layout_marginRight="15dp"
android:src="@drawable/icon_guan" /> android:src="@drawable/icon_guan" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
...@@ -237,7 +301,7 @@ ...@@ -237,7 +301,7 @@
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@drawable/shape_ff2e31_r25" android:background="@drawable/shape_ff2e31_r25"
android:gravity="center" android:gravity="center"
android:text="保存" android:text="@string/Add"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment