diff --git a/app/src/main/java/com/dahe/pass/bean/BusInfoBean.java b/app/src/main/java/com/dahe/pass/bean/BusInfoBean.java index a5777f3..7d70921 100644 --- a/app/src/main/java/com/dahe/pass/bean/BusInfoBean.java +++ b/app/src/main/java/com/dahe/pass/bean/BusInfoBean.java @@ -14,6 +14,7 @@ public class BusInfoBean implements Serializable { private String code; private String enterpriseName; private String pwd; + private String approvedBy; private String unifiedSocialCreditCode;//统一社会信用代码 private String nationalClassA;//国家A级 private String businessType;//业务类型 @@ -26,6 +27,14 @@ public class BusInfoBean implements Serializable { private String name;//厂区地址 private ParamsDao params; + public String getApprovedBy() { + return approvedBy; + } + + public void setApprovedBy(String approvedBy) { + this.approvedBy = approvedBy; + } + public String getUnifiedSocialCreditCode() { return unifiedSocialCreditCode; } diff --git a/app/src/main/java/com/dahe/pass/ui/account/activity/BusinessInfoActivity.kt b/app/src/main/java/com/dahe/pass/ui/account/activity/BusinessInfoActivity.kt index 3700d99..50ad6f1 100644 --- a/app/src/main/java/com/dahe/pass/ui/account/activity/BusinessInfoActivity.kt +++ b/app/src/main/java/com/dahe/pass/ui/account/activity/BusinessInfoActivity.kt @@ -15,6 +15,7 @@ import com.dahe.mylibrary.utils.ActivityUtils import com.dahe.pass.R import com.dahe.pass.base.AppConfig import com.dahe.pass.bean.BusInfoBean +import com.dahe.pass.bean.CompanyBean import com.dahe.pass.bean.JsonBean import com.dahe.pass.net.BaseObserver import com.dahe.pass.net.DataManager @@ -40,6 +41,8 @@ import java.util.ArrayList * @Description TODO */ class BusinessInfoActivity : BaseActivity(), View.OnClickListener { + lateinit var curCompanyBean: CompanyBean + override fun getLayout() = R.layout.activity_business_info override fun initView(savedInstanceState: Bundle?) { @@ -49,6 +52,7 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener { tv_yszc.setOnClickListener(this) etDj.setOnClickListener(this) etDz.setOnClickListener(this) + etSpdw.setOnClickListener(this) } override fun initDate() { @@ -79,9 +83,62 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener { null, { position, text -> etDj.text = text }).show() } + + R.id.etSpdw -> spdw() } } + fun spdw() { + KeyboardUtils.hideSoftInput(etQymc) + DataManager.getInstance().companyLst() + .compose(DataManager.setThread()) + .subscribe(BaseObserver(mContext, object : RxHttpCallBack>(this) { + override fun onSuccess(t: CommonResponseBean>) { + super.onSuccess(t) + val data = t.data + + + val mutableListOf = mutableListOf() + val build = OptionsPickerBuilder(mContext + ) { options1, options2, options3, v -> //返回的分别是三个级别的选中位置 + curCompanyBean = mutableListOf.get(options1) + etSpdw.text = mutableListOf.get(options1).signName + } + .setTitleText("审批单位") + .setContentTextSize(20) //设置滚轮文字大小 + .setDividerColor(Color.LTGRAY) //设置分割线的颜色 + .setSelectOptions(0, 1) //默认选中项 + .setTitleColor(Color.BLACK) + .setSubmitColor(Color.parseColor("#F1474B")) //确定按钮文字颜色 + .setCancelColor(Color.parseColor("#F1474B")) //取消按钮文字颜色 + .setTitleBgColor(Color.parseColor("#FFFFFF")) + .setBgColor(Color.parseColor("#F5F5F5")) + .setTextColorCenter(Color.LTGRAY) + .isRestoreItem(true) //切换时是否还原，设置默认选中第一项。 + .isCenterLabel(false) //是否只显示中间选中项的label文字，false则每项item全部都带有label。 + .setLabels("", "", "") +// .setOutSideColor(0x00000000) //设置外部遮罩颜色 + .setOptionsSelectChangeListener { options1, options2, options3 -> + val str = + "options1: $options1\noptions2: $options2\noptions3: $options3" +// Toast.makeText(this@MainActivity, str, Toast.LENGTH_SHORT).show() + } + .build() + + data.forEach { + mutableListOf.add(it) + } + + + + build.setPicker(mutableListOf) + + build.show() + + } + })) + } + fun go() { val qymc = etQymc.text.toString() // val ywlx = etYwlx.text.toString() @@ -93,16 +150,16 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener { return } -// if (ywlx.isNullOrEmpty()) { -// showToast("请输入业务类型") -// return -// } - if (etDz.isNullOrEmpty()) { showToast("请输入注册地址") return } + if (!::curCompanyBean.isInitialized) { + showToast("请完善审批单位") + return + } + if (etNsr.text.toString().isNullOrEmpty() || etFzr.text.toString().isNullOrEmpty() || etFzrPhone.text.toString().isNullOrEmpty() || etDj.text.toString().isNullOrEmpty() || etGsdz.text.toString().isNullOrEmpty() @@ -123,6 +180,7 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener { busInfoBean.unifiedSocialCreditCode = etNsr.text.toString() busInfoBean.enterpriseName = qymc busInfoBean.nationalClassA = etDj.text.toString() + busInfoBean.approvedBy = curCompanyBean.sign // busInfoBean.businessType = ywlx busInfoBean.placeOfRegistration = etDz busInfoBean.companyAddress = etGsdz.text.toString() diff --git a/app/src/main/res/drawable-xxhdpi/spdw.png b/app/src/main/res/drawable-xxhdpi/spdw.png new file mode 100644 index 0000000..51f56a2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/spdw.png differ diff --git a/app/src/main/res/layout/activity_business_info.xml b/app/src/main/res/layout/activity_business_info.xml index 552edb9..e9f4316 100644 --- a/app/src/main/res/layout/activity_business_info.xml +++ b/app/src/main/res/layout/activity_business_info.xml @@ -151,6 +151,39 @@ android:maxLines="1"> + + + + + + + + + - + android:textSize="14dp"> @@ -172,6 +172,8 @@ android:layout_height="wrap_content" android:background="@null" android:gravity="right" + android:maxLines="1" + android:singleLine="true" android:hint="请输入车牌号" android:paddingRight="6dp" android:textSize="14dp"> @@ -378,6 +380,8 @@ android:background="@null" android:gravity="right" android:hint="请输入起点" + android:maxLines="1" + android:singleLine="true" android:paddingRight="6dp" android:textSize="14dp"> @@ -411,6 +415,8 @@ android:background="@null" android:gravity="right" android:hint="请输入运终点" + android:maxLines="1" + android:singleLine="true" android:paddingRight="6dp" android:textSize="14dp">