diff --git a/app/build.gradle b/app/build.gradle index 55210bb..b279f85 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,7 +55,7 @@ android { applicationId rootProject.ext.android.applicationId manifestPlaceholders = [CHANNEL_VALUE: "企业端(测试)"] - buildConfigField "String", "BASE_URL", "\"http://pass.dahehuoyun.com:8091/\"" + buildConfigField "String", "BASE_URL", "\"http://192.168.1.129:8091/\"" buildConfigField "String", "BASE_HEAD_URL", "\"http://47.104.167.116:8080/guns/gunsApi/kaptcha/\"" buildConfigField "boolean", "isTest", "true" //APP名称，可以在androidMainfest中引用 @@ -64,7 +64,7 @@ android { sign_product { applicationId rootProject.ext.android.applicationId manifestPlaceholders = [CHANNEL_VALUE: "企业端"] - buildConfigField "String", "BASE_URL", "\"http://pass.dahehuoyun.com:8091/\"" + buildConfigField "String", "BASE_URL", "\"http://pass.test.dahehuoyun.com:8091/\"" buildConfigField "String", "BASE_HEAD_URL", "\"http://47.104.167.116:8080/guns/gunsApi/kaptcha/\"" buildConfigField "boolean", "isTest", "false" // resValue "string", "appName", "审核" diff --git a/app/sign_product/release/output-metadata.json b/app/sign_product/release/output-metadata.json index cbebb1d..e41ded5 100644 --- a/app/sign_product/release/output-metadata.json +++ b/app/sign_product/release/output-metadata.json @@ -10,9 +10,9 @@ { "type": "SINGLE", "filters": [], - "versionCode": 8, - "versionName": "1.0.8", - "outputFile": "企业端正式_release_1.0.8_202204061736.apk" + "versionCode": 12, + "versionName": "1.1.2", + "outputFile": "企业端正式_release_1.1.2_202204251458.apk" } ] } \ No newline at end of file diff --git a/app/sign_product/release/企业端正式_release_1.1.2_202204251458.apk b/app/sign_product/release/企业端正式_release_1.1.2_202204251458.apk new file mode 100644 index 0000000..f3b3c5b Binary files /dev/null and b/app/sign_product/release/企业端正式_release_1.1.2_202204251458.apk differ diff --git a/app/src/main/java/com/dahe/pass/base/AppConfig.java b/app/src/main/java/com/dahe/pass/base/AppConfig.java index 545fd82..36a41e5 100644 --- a/app/src/main/java/com/dahe/pass/base/AppConfig.java +++ b/app/src/main/java/com/dahe/pass/base/AppConfig.java @@ -11,5 +11,8 @@ public class AppConfig { public static final String BEAN= "DA_HE_BEAN"; public static String START_TIME= "DA_HE_START_TIME"; public static String END_TIME= "DA_HE_END_TIME"; + public static String PHONE= "DA_HE_PHONE"; + public static String PWD= "DA_HE_PWD"; + public static String REISTER= "DA_HE_REISTER"; public static final String CODE= "DA_HE_PHONE"; } diff --git a/app/src/main/java/com/dahe/pass/bean/ComFirstBean.java b/app/src/main/java/com/dahe/pass/bean/ComFirstBean.java new file mode 100644 index 0000000..17effaf --- /dev/null +++ b/app/src/main/java/com/dahe/pass/bean/ComFirstBean.java @@ -0,0 +1,100 @@ +package com.dahe.pass.bean; + +import com.contrarywind.interfaces.IPickerViewData; + +import java.util.jar.Attributes; + +/** + * @ClassName ComFirstBean + * @Author 用户 + * @Date 2022/4/12 10:25 + * @Description TODO + */ +public class ComFirstBean implements IPickerViewData { + private String searchValue; + private String createTime; + private String deptName; + private String phone; + private String parentId; + private String deptId; + private String signName; + private String sign; + private String startWith; + + public String getSearchValue() { + return searchValue; + } + + public void setSearchValue(String searchValue) { + this.searchValue = searchValue; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getSignName() { + return signName; + } + + public void setSignName(String signName) { + this.signName = signName; + } + + public String getSign() { + return sign; + } + + public void setSign(String sign) { + this.sign = sign; + } + + public String getStartWith() { + return startWith; + } + + public void setStartWith(String startWith) { + this.startWith = startWith; + } + + @Override + public String getPickerViewText() { + return signName; + } +} diff --git a/app/src/main/java/com/dahe/pass/bean/ComSecondBean.java b/app/src/main/java/com/dahe/pass/bean/ComSecondBean.java new file mode 100644 index 0000000..bcdd7fe --- /dev/null +++ b/app/src/main/java/com/dahe/pass/bean/ComSecondBean.java @@ -0,0 +1,56 @@ +package com.dahe.pass.bean; + +import com.contrarywind.interfaces.IPickerViewData; + +import java.io.Serializable; + +/** + * @ClassName ComSecondBean + * @Author 用户 + * @Date 2022/4/12 9:39 + * @Description TODO + */ +public class ComSecondBean implements Serializable , IPickerViewData { + + private String childSignId; + private String childSign; + private String childSignName; + private String childStartWith; + + public String getChildSignId() { + return childSignId; + } + + public void setChildSignId(String childSignId) { + this.childSignId = childSignId; + } + + public String getChildSign() { + return childSign; + } + + public void setChildSign(String childSign) { + this.childSign = childSign; + } + + public String getChildSignName() { + return childSignName; + } + + public void setChildSignName(String childSignName) { + this.childSignName = childSignName; + } + + public String getChildStartWith() { + return childStartWith; + } + + public void setChildStartWith(String childStartWith) { + this.childStartWith = childStartWith; + } + + @Override + public String getPickerViewText() { + return childSignName; + } +} diff --git a/app/src/main/java/com/dahe/pass/bean/CompanyBean.java b/app/src/main/java/com/dahe/pass/bean/CompanyBean.java index 1a86aca..43e97ac 100644 --- a/app/src/main/java/com/dahe/pass/bean/CompanyBean.java +++ b/app/src/main/java/com/dahe/pass/bean/CompanyBean.java @@ -3,6 +3,7 @@ package com.dahe.pass.bean; import com.contrarywind.interfaces.IPickerViewData; import java.io.Serializable; +import java.util.ArrayList; /** * @ClassName CompanyBean @@ -10,7 +11,7 @@ import java.io.Serializable; * @Date 2022/1/15 9:05 * @Description TODO */ -public class CompanyBean implements Serializable , IPickerViewData { +public class CompanyBean implements IPickerViewData { private String searchValue; private String createTime; private String deptName; @@ -19,7 +20,25 @@ public class CompanyBean implements Serializable , IPickerViewData { private String deptId; private String signName; private String sign; + private String startWith; + private ArrayList appleInfoVos; + + public ArrayList getAppleInfoVos() { + return appleInfoVos; + } + + public void setAppleInfoVos(ArrayList appleInfoVos) { + this.appleInfoVos = appleInfoVos; + } + + public String getStartWith() { + return startWith; + } + + public void setStartWith(String startWith) { + this.startWith = startWith; + } public String getSignName() { return signName; diff --git a/app/src/main/java/com/dahe/pass/net/Api.java b/app/src/main/java/com/dahe/pass/net/Api.java index e9be1cb..00751b5 100644 --- a/app/src/main/java/com/dahe/pass/net/Api.java +++ b/app/src/main/java/com/dahe/pass/net/Api.java @@ -67,6 +67,12 @@ public interface Api { @POST(BASE_URL+"apply/approval/company/list") Observable>> companyLst(); + @POST(BASE_URL+"apply/approval/company/list") + Observable>> companyLst(@Query("sign") String sign); + + @POST(BASE_URL+"apply/approval/pid/list") + Observable>> pidList(); + @POST(BASE_URL+"apply/enterprise/type/list") Observable>> typeLst(@Query("sign") String sign); @@ -81,6 +87,17 @@ public interface Api { @POST(BASE_URL+"use/of/pass/count") Observable> passCount(@Query("useDate") String usedate); + @GET(BASE_URL+"use/notReport/getTodayInfo") + Observable> getTodayInfo(@Query("useDate") String usedate); + + @POST(BASE_URL+"apply/approval/pid/all") + Observable>> pidAll(); + + + //新增用户不上报信息 + @POST(BASE_URL+"use/notReport/add") + Observable notReportadd(@Query("useDate") String useDate); + @POST(BASE_URL+"apply/count") Observable> applyCount(@Query("updateStartTime") String createTime,@Query("updateEndTime") String updateEndTime); @@ -104,5 +121,11 @@ public interface Api { @POST(BASE_URL+"use/of/pass/importData") Observable importData(@Body PassBean passBean); + @POST(BASE_URL+"user/lookSmsCode") + Observable lookSmsCode(@Query("phone") String phone,@Query("code") String code); + + @GET(BASE_URL+"use/of/pass/getPassNoInfo") + Observable getPassNoInfo(@Query("passNo") String passNo); + } diff --git a/app/src/main/java/com/dahe/pass/ui/account/LoginActivity.kt b/app/src/main/java/com/dahe/pass/ui/account/LoginActivity.kt index b2124b0..db78cda 100644 --- a/app/src/main/java/com/dahe/pass/ui/account/LoginActivity.kt +++ b/app/src/main/java/com/dahe/pass/ui/account/LoginActivity.kt @@ -1,6 +1,9 @@ package com.dahe.pass.ui.account import android.Manifest +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent import android.os.Bundle import android.text.TextUtils import android.text.method.HideReturnsTransformationMethod @@ -11,6 +14,7 @@ import com.dahe.mylibrary.net.CommonResponseBean import com.dahe.mylibrary.net.JsonUtils import com.dahe.mylibrary.utils.ActivityUtils import com.dahe.pass.R +import com.dahe.pass.base.AppConfig import com.dahe.pass.bean.UserBean import com.dahe.pass.net.BaseObserver import com.dahe.pass.net.DataManager @@ -19,6 +23,7 @@ import com.dahe.pass.ui.HomeActivity import com.dahe.pass.ui.account.activity.RegisterActivity import com.dahe.pass.utils.AppActivityUtils import com.dahe.pass.utils.SPUtils +import com.lxj.xpopup.util.KeyboardUtils import kotlinx.android.synthetic.main.activity_login.* import pub.devrel.easypermissions.AppSettingsDialog import pub.devrel.easypermissions.EasyPermissions @@ -86,7 +91,9 @@ class LoginActivity : BaseActivity(), EasyPermissions.PermissionCallbacks, View. R.id.tv_yszc -> AppActivityUtils.openWebViewActivity(this, "隐私政策", "https://downtest.dahehuodongbao.com/passcheck/user-privacy.html") - R.id.tvZc, R.id.tvXyh -> ActivityUtils.startActivity(this, RegisterActivity::class.java) + R.id.tvZc, R.id.tvXyh -> ActivityUtils.startActivityForResult(this, + RegisterActivity::class.java, + 0) } } @@ -106,6 +113,7 @@ class LoginActivity : BaseActivity(), EasyPermissions.PermissionCallbacks, View. * 密码登录 */ private fun logByPass() { + KeyboardUtils.hideSoftInput(et_phone) val s: String = et_phone.getText().toString().trim() val s1: String = et_pass.getText().toString().trim() if (TextUtils.isEmpty(s) || TextUtils.isEmpty(s1)) { @@ -188,4 +196,13 @@ class LoginActivity : BaseActivity(), EasyPermissions.PermissionCallbacks, View. .setRationale("如果没有请求的权限，此应用可能无法正常工作。 打开应用程序设置屏幕以修改应用程序权限").build().show() } } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) + if (data != null && resultCode == RESULT_OK) { +// val extras = data.extras +// et_phone.setText(extras?.getString(AppConfig.PHONE)) +// et_pass.setText(extras?.getString(AppConfig.PWD)) + } + } } \ No newline at end of file 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 485ab0e..c08f7ba 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 @@ -1,6 +1,7 @@ package com.dahe.pass.ui.account.activity import android.annotation.SuppressLint +import android.content.Intent import android.graphics.Color import android.os.Bundle import android.os.Handler @@ -23,6 +24,7 @@ import com.dahe.pass.net.RxHttpCallBack import com.dahe.pass.ui.account.LoginActivity import com.dahe.pass.utils.AppActivityUtils import com.dahe.pass.utils.GetJsonDataUtil +import com.dahe.pass.utils.SPUtils import com.google.gson.Gson import com.lxj.xpopup.XPopup import com.lxj.xpopup.util.KeyboardUtils @@ -56,8 +58,36 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener { } override fun initDate() { + val get = SPUtils.get(this, AppConfig.REISTER, "") + if (get is BusInfoBean){ + etNsr.setText(get.unifiedSocialCreditCode) + etQymc.setText(get.enterpriseName) + etDj.setText(get.nationalClassA) + etDz.setText(get.placeOfRegistration) + etGsdz.setText(get.companyAddress) + etFzr.setText(get.contacts) + etFzrPhone.setText(get.contactsPhone) + etTbr.setText(get.name) + } } + override fun onStop() { + super.onStop() + val busInfoBean = BusInfoBean() + + busInfoBean.unifiedSocialCreditCode = etNsr.text.toString() + busInfoBean.enterpriseName = etQymc.text.toString() + busInfoBean.nationalClassA = etDj.text.toString() + busInfoBean.placeOfRegistration = etDz.text.toString() + busInfoBean.companyAddress = etGsdz.text.toString() + busInfoBean.contacts = etFzr.text.toString() + busInfoBean.contactsPhone = etFzrPhone.text.toString() + busInfoBean.name = etTbr.text.toString() + + SPUtils.put(this,AppConfig.REISTER,busInfoBean) + } + + override fun onClick(view: View) { super.onClick(view) when (view.id) { @@ -155,10 +185,10 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener { return } - if (!::curCompanyBean.isInitialized) { - showToast("请完善审批单位") - return - } +// if (!::curCompanyBean.isInitialized) { +// showToast("请完善审批单位") +// return +// } if (etNsr.text.toString().isNullOrEmpty() || etFzr.text.toString().isNullOrEmpty() || etFzrPhone.text.toString().isNullOrEmpty() || etDj.text.toString().isNullOrEmpty() || @@ -180,7 +210,7 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener { busInfoBean.unifiedSocialCreditCode = etNsr.text.toString() busInfoBean.enterpriseName = qymc busInfoBean.nationalClassA = etDj.text.toString() - busInfoBean.approvedBy = curCompanyBean.sign +// busInfoBean.approvedBy = curCompanyBean.sign // busInfoBean.businessType = ywlx busInfoBean.placeOfRegistration = etDz busInfoBean.companyAddress = etGsdz.text.toString() @@ -196,6 +226,11 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener { .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { override fun onSuccess(t: CommonResponseBean?) { super.onSuccess(t) + +// val intent = Intent("com.dahehaoyun.log.info") +// intent.putExtra(AppConfig.PHONE,bean.phone) +// intent.putExtra(AppConfig.PWD,bean.pwd) +// sendBroadcast(intent) ActivityUtils.finishOtherActivities(LoginActivity::class.java) } })) diff --git a/app/src/main/java/com/dahe/pass/ui/account/activity/RegisterActivity.kt b/app/src/main/java/com/dahe/pass/ui/account/activity/RegisterActivity.kt index 21bd398..bc42c3c 100644 --- a/app/src/main/java/com/dahe/pass/ui/account/activity/RegisterActivity.kt +++ b/app/src/main/java/com/dahe/pass/ui/account/activity/RegisterActivity.kt @@ -1,5 +1,6 @@ package com.dahe.pass.ui.account.activity +import android.content.Intent import android.os.Bundle import android.text.TextUtils import android.text.method.HideReturnsTransformationMethod @@ -18,6 +19,7 @@ import com.dahe.pass.net.DataManager import com.dahe.pass.net.RxHttpCallBack import com.dahe.pass.ui.HomeActivity import com.dahe.pass.utils.AppActivityUtils +import com.lxj.xpopup.util.KeyboardUtils import kotlinx.android.synthetic.main.activity_register.* import java.util.* @@ -89,6 +91,7 @@ class RegisterActivity : BaseActivity(), View.OnClickListener { } fun next() { + KeyboardUtils.hideSoftInput(etPhone) val phone = etPhone.text.toString() val code = etCode.text.toString() val pwd = etPass.text.toString() @@ -97,17 +100,38 @@ class RegisterActivity : BaseActivity(), View.OnClickListener { showToast("请完善信息") return } - val busInfoBean = BusInfoBean() - busInfoBean.phone = phone - val paramsDao = BusInfoBean.ParamsDao() - paramsDao.code = code - busInfoBean.params = paramsDao + DataManager.getInstance().lookSmsCode(phone,code) + .compose(DataManager.setThread()) + .subscribe(BaseObserver(this,object : RxHttpCallBack(){ + override fun onSuccess(t: CommonResponseBean?) { + super.onSuccess(t) + val busInfoBean = BusInfoBean() + busInfoBean.phone = phone - busInfoBean.pwd = pwd - val bundle = Bundle() - bundle.putSerializable(AppConfig.BEAN, busInfoBean) - ActivityUtils.startActivity(mContext, BusinessInfoActivity::class.java, bundle) + val paramsDao = BusInfoBean.ParamsDao() + paramsDao.code = code + busInfoBean.params = paramsDao + + busInfoBean.pwd = pwd + val bundle = Bundle() + bundle.putSerializable(AppConfig.BEAN, busInfoBean) + ActivityUtils.startActivity(mContext, BusinessInfoActivity::class.java, bundle) + } + })) + + + } + + override fun onDestroy() { + super.onDestroy() +// val intent = Intent() +// val bundle = Bundle() +// bundle.putString(AppConfig.PHONE,etPhone.text.toString()) +// bundle.putString(AppConfig.PHONE,etPass.text.toString()) +// intent.putExtras(bundle) +// setResult(RESULT_OK,intent) +// finish() } } \ No newline at end of file diff --git a/app/src/main/java/com/dahe/pass/ui/gone/GoneFragment.kt b/app/src/main/java/com/dahe/pass/ui/gone/GoneFragment.kt index 268f2f3..f4dedd3 100644 --- a/app/src/main/java/com/dahe/pass/ui/gone/GoneFragment.kt +++ b/app/src/main/java/com/dahe/pass/ui/gone/GoneFragment.kt @@ -20,6 +20,7 @@ import com.dahe.mylibrary.utils.TimeUtil import com.dahe.pass.R import com.dahe.pass.adapter.GoneAdapter import com.dahe.pass.base.AppConfig +import com.dahe.pass.bean.ApplyBean import com.dahe.pass.bean.PassBean import com.dahe.pass.net.BaseObserver import com.dahe.pass.net.DataManager @@ -27,6 +28,7 @@ import com.dahe.pass.net.RxHttpCallBack import com.dahe.pass.ui.gone.activity.AddGoActivity import com.dahe.pass.ui.gone.activity.EditGoActivity import com.lxj.xpopup.XPopup +import com.lxj.xpopup.interfaces.OnConfirmListener import kotlinx.android.synthetic.main.fragment_gone.* import java.text.SimpleDateFormat import java.util.* @@ -71,6 +73,7 @@ class GoneFragment : BaseFragment(), RefreshCallBack, View.OnClickListener { tvSearch.setOnClickListener(this) llClear.setOnClickListener(this) + tvNoUse.setOnClickListener(this) tvSearch.addTextChangedListener { if (it.toString().length > 0) { llClear.visibility = View.VISIBLE @@ -82,7 +85,7 @@ class GoneFragment : BaseFragment(), RefreshCallBack, View.OnClickListener { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) - if (requestCode==10005){ + if (requestCode == 10005) { val data1 = data?.data //文件名 val path = PickUtils.getPath(getContext(), data1) @@ -94,6 +97,7 @@ class GoneFragment : BaseFragment(), RefreshCallBack, View.OnClickListener { override fun onClick(v: View) { when (v.id) { R.id.tvSearch -> setBir(tvSearch) + R.id.tvNoUse -> noUse() R.id.llClear -> { tvSearch.text = "" initData() @@ -104,6 +108,45 @@ class GoneFragment : BaseFragment(), RefreshCallBack, View.OnClickListener { override fun getRefreshDate(stat: Int, page: Int, count: Int) { } + fun isShowNoUse(){ + DataManager.getInstance().getTodayInfo("") + .compose(DataManager.setThread()) + .subscribe(BaseObserver(mContext,object : RxHttpCallBack(){ + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + val data = t.data + if (null == data.enterpriseName){ + tvNoUse.visibility = View.VISIBLE + }else{ + tvNoUse.visibility = View.GONE + } + } + })) + } + + fun noUse() { + XPopup.Builder(activity) + .dismissOnBackPressed(true) + .dismissOnTouchOutside(true) +// .hasNavigationBar(false) + .isDestroyOnDismiss(true) + .asConfirm("温馨提示", "当您提交当天未使用后，当天是不可以再上报了，你确认定要提交吗？", + "取消", "确定", + object : OnConfirmListener { + override fun onConfirm() { + DataManager.getInstance().notReportadd(TimeUtil.getNowString(SimpleDateFormat("yyyy-MM-dd", + Locale.getDefault()))) + .compose(DataManager.setThread()) + .subscribe(BaseObserver(activity,object : RxHttpCallBack(){ + override fun onSuccess(t: CommonResponseBean?) { + super.onSuccess(t) + tvNoUse.visibility = View.GONE + } + })) + } + }, null, false).show() + } + fun initData() { DataManager.getInstance().passCount(tvSearch.text.toString()) .compose(DataManager.setThread()) @@ -131,6 +174,8 @@ class GoneFragment : BaseFragment(), RefreshCallBack, View.OnClickListener { applyAdapter.setList(t?.data?.rows) } })) + + isShowNoUse() // Observable.zip(DataManager.getInstance().passCount(), // DataManager.getInstance().passList(tvSearch.text.toString()), // { item1, item2 -> diff --git a/app/src/main/java/com/dahe/pass/ui/gone/activity/AddGoActivity.kt b/app/src/main/java/com/dahe/pass/ui/gone/activity/AddGoActivity.kt index b63e6ea..d7eb43b 100644 --- a/app/src/main/java/com/dahe/pass/ui/gone/activity/AddGoActivity.kt +++ b/app/src/main/java/com/dahe/pass/ui/gone/activity/AddGoActivity.kt @@ -29,8 +29,10 @@ import com.dahe.pass.utils.GetJsonDataUtil import com.dahe.pass.utils.SPUtils import com.google.gson.Gson import com.king.keyboard.KingKeyboard +import com.lxj.xpopup.XPopup import com.lxj.xpopup.util.KeyboardUtils import kotlinx.android.synthetic.main.activity_add_go.* +import kotlinx.android.synthetic.main.activity_business_info.* import org.json.JSONArray import java.text.SimpleDateFormat import java.util.* @@ -44,8 +46,8 @@ import java.util.* */ class AddGoActivity : BaseActivity(), View.OnClickListener { - private var pointType : Int = 0 - private lateinit var kingKeyboard : KingKeyboard + private var pointType: Int = 0 + private lateinit var kingKeyboard: KingKeyboard override fun getLayout() = R.layout.activity_add_go @@ -61,13 +63,14 @@ class AddGoActivity : BaseActivity(), View.OnClickListener { etQd.setOnClickListener(this) etZd.setOnClickListener(this) tvUpTime.setOnClickListener(this) + tvType.setOnClickListener(this) // tvTxbh.filters = arrayOf(InputFilterMinMax(0,2455)) etDs.filters = arrayOf(NumRangeInputFilter()) // tvSTime.text = SPUtils.get(mContext,AppConfig.START_TIME, "").toString() // tvETime.text = SPUtils.get(mContext,AppConfig.END_TIME, "").toString() - kingKeyboard = KingKeyboard(this,keyboardParent) - kingKeyboard.register(etCarNum,KingKeyboard.KeyboardType.LICENSE_PLATE_PROVINCE) + kingKeyboard = KingKeyboard(this, keyboardParent) + kingKeyboard.register(etCarNum, KingKeyboard.KeyboardType.LICENSE_PLATE_PROVINCE) } override fun initDate() { @@ -98,6 +101,7 @@ class AddGoActivity : BaseActivity(), View.OnClickListener { R.id.tvStartTime -> setBir(2, tvStartTime) R.id.tvEndTime -> setBir(3, tvEndTime) R.id.tvSflx -> freeOrBuy() + R.id.tvType -> choiceType() R.id.etQd -> { KeyboardUtils.hideSoftInput(tvTxbh) if (isLoaded) { @@ -121,31 +125,48 @@ class AddGoActivity : BaseActivity(), View.OnClickListener { } + fun choiceType() { + XPopup.Builder(this).hasShadowBg(false).offsetY(50).atView(tvType) +// .popupWidth(500) + .asAttachList(arrayOf("FG", "SW"), + null, + { position, text -> tvType.text = text+"-" }).show() + } fun sub() { KeyboardUtils.hideSoftInput(tvTxbh) val toString = tvTxbh.text.toString() val substring = toString.substring(0, 1) - if ("0"!=substring){ - showToast("通行证编号需 0 开头") - return - } - val toDouble = tvTxbh.text.toString().toDouble() - if (toDouble<1101){ - showToast("通行证编号不能小于1101") - return - } +// if ("0" != substring) { +// showToast("通行证编号需 0 开头") +// return +// } +// val toDouble = tvTxbh.text.toString().toDouble() +// if (toDouble < 1101) { +// showToast("通行证编号不能小于1101") +// return +// } +// +// if (toDouble > 2455) { +// showToast("通行证编号不能大于2455") +// return +// } - if (toDouble>2455){ - showToast("通行证编号不能大于2455") - return - } + + DataManager.getInstance().getPassNoInfo("""${tvType.text.toString()}${tvTxbh.text.toString()}""") + .compose(DataManager.setThread()) + .subscribe(BaseObserver(mContext,object : RxHttpCallBack(){ + override fun onSuccess(t: CommonResponseBean?) { + super.onSuccess(t) + } + })) if (tvTxbh.text.toString().isNullOrEmpty() || etCarNum.text.toString().isNullOrEmpty() || etName.text.toString().isNullOrEmpty() || etPhone.text.toString().isNullOrEmpty() || etWpzl.text.toString().isNullOrEmpty() || - etDs.text.toString().isNullOrEmpty() || etQd.text.toString().isNullOrEmpty()|| etCardId.text.toString().isNullOrEmpty() + etDs.text.toString().isNullOrEmpty() || etQd.text.toString() + .isNullOrEmpty() || etCardId.text.toString().isNullOrEmpty() ) { showToast("请完善信息") return @@ -154,8 +175,9 @@ class AddGoActivity : BaseActivity(), View.OnClickListener { + val passBean = PassBean() - passBean.passNo = """FG-${tvTxbh.text.toString()}""" + passBean.passNo = """${tvType.text.toString()}${tvTxbh.text.toString()}""" passBean.vehicle = etCarNum.text.toString() passBean.driverName = etName.text.toString() passBean.driverPhone = etPhone.text.toString() @@ -178,8 +200,8 @@ class AddGoActivity : BaseActivity(), View.OnClickListener { super.onSuccess(t) showToast("车辆添加成功") finish() - SPUtils.put(mContext,AppConfig.START_TIME,passBean.useStartTime) - SPUtils.put(mContext,AppConfig.END_TIME,passBean.useStartTime) + SPUtils.put(mContext, AppConfig.START_TIME, passBean.useStartTime) + SPUtils.put(mContext, AppConfig.END_TIME, passBean.useStartTime) } })) } @@ -212,8 +234,8 @@ class AddGoActivity : BaseActivity(), View.OnClickListener { // Toast.makeText(this@MainActivity, str, Toast.LENGTH_SHORT).show() } .build() - mutableListOf.add(CompanyBean("免费","0")) - mutableListOf.add(CompanyBean("收费","1")) + mutableListOf.add(CompanyBean("免费", "0")) + mutableListOf.add(CompanyBean("收费", "1")) @@ -286,9 +308,9 @@ class AddGoActivity : BaseActivity(), View.OnClickListener { ) options3Items.get(options1).get(options2).get(options3) else "" val tx = "$opt1tx-$opt2tx-$opt3tx" // tvDz.text = tx - if (0== pointType){ + if (0 == pointType) { etQd.text = tx - }else{ + } else { etZd.text = tx } } diff --git a/app/src/main/java/com/dahe/pass/ui/gone/activity/EditGoActivity.kt b/app/src/main/java/com/dahe/pass/ui/gone/activity/EditGoActivity.kt index 08a27a8..f236850 100644 --- a/app/src/main/java/com/dahe/pass/ui/gone/activity/EditGoActivity.kt +++ b/app/src/main/java/com/dahe/pass/ui/gone/activity/EditGoActivity.kt @@ -105,7 +105,7 @@ class EditGoActivity : BaseActivity(), View.OnClickListener { fun sub() { KeyboardUtils.hideSoftInput(tvTxbh) - if (tvTxbh.text.toString().isNullOrEmpty() || tvSTime.text.toString().isNullOrEmpty() || + if (tvTxbh.text.toString().isNullOrEmpty() || etCarNum.text.toString().isNullOrEmpty() || etName.text.toString().isNullOrEmpty() || etPhone.text.toString().isNullOrEmpty() || etWpzl.text.toString().isNullOrEmpty() || etDs.text.toString().isNullOrEmpty() || etQd.text.toString().isNullOrEmpty() diff --git a/app/src/main/java/com/dahe/pass/ui/home/activity/ApplyActivity.kt b/app/src/main/java/com/dahe/pass/ui/home/activity/ApplyActivity.kt index afed4e4..81f798e 100644 --- a/app/src/main/java/com/dahe/pass/ui/home/activity/ApplyActivity.kt +++ b/app/src/main/java/com/dahe/pass/ui/home/activity/ApplyActivity.kt @@ -21,8 +21,10 @@ import com.dahe.pass.utils.SPUtils import com.google.gson.Gson import com.lxj.xpopup.util.KeyboardUtils import kotlinx.android.synthetic.main.activity_apply.* +import kotlinx.android.synthetic.main.activity_apply.etQymc +import kotlinx.android.synthetic.main.activity_business_info.* import org.json.JSONArray -import java.util.ArrayList +import java.util.* /** * @ClassName ApplyActivity @@ -34,6 +36,7 @@ class ApplyActivity : BaseActivity(), View.OnClickListener { lateinit var curCompanyBean: CompanyBean lateinit var curCompanyType: CompanyTypeBean + lateinit var childSign: String lateinit var jb: String lateinit var sheng: String lateinit var shi: String @@ -53,7 +56,7 @@ class ApplyActivity : BaseActivity(), View.OnClickListener { tvSflx.setOnClickListener(this) val userInfo = SPUtils.getUserInfo(this).userInfo - if (null!=userInfo){ + if (null != userInfo) { etLxr.text = userInfo.contacts etPhone.text = userInfo.contactsPhone } @@ -173,25 +176,34 @@ class ApplyActivity : BaseActivity(), View.OnClickListener { build.show() } - + private var opt1: MutableList = mutableListOf() + private var opt2: MutableList> = mutableListOf() fun spdw() { KeyboardUtils.hideSoftInput(etQymc) - DataManager.getInstance().companyLst() + + opt1.clear() + opt2.clear() + + DataManager.getInstance().pidAll() .compose(DataManager.setThread()) - .subscribe(BaseObserver(mContext, object : RxHttpCallBack>(this) { - override fun onSuccess(t: CommonResponseBean>) { + .subscribe(BaseObserver(this, object : RxHttpCallBack>() { + override fun onSuccess(t: CommonResponseBean>) { super.onSuccess(t) val data = t.data + data.forEach { + opt1.add(it) + opt2.add(it.appleInfoVos) + } - - val mutableListOf = mutableListOf() - val build = OptionsPickerBuilder(mContext + val pvOptions: OptionsPickerView<*> = OptionsPickerBuilder(mContext ) { options1, options2, options3, v -> //返回的分别是三个级别的选中位置 - curCompanyBean = mutableListOf.get(options1) - tvSpdw.text = mutableListOf.get(options1).signName +// var tx =(opt1[options1].pickerViewText +// + opt2[options1][options2].pickerViewText) + tvSpdw.text = opt2[options1][options2].pickerViewText + childSign = opt2[options1][options2].childSign } .setTitleText("审批单位") - .setContentTextSize(20) //设置滚轮文字大小 + .setContentTextSize(16) //设置滚轮文字大小 .setDividerColor(Color.LTGRAY) //设置分割线的颜色 .setSelectOptions(0, 1) //默认选中项 .setTitleColor(Color.BLACK) @@ -209,21 +221,62 @@ class ApplyActivity : BaseActivity(), View.OnClickListener { "options1: $options1\noptions2: $options2\noptions3: $options3" // Toast.makeText(this@MainActivity, str, Toast.LENGTH_SHORT).show() } - .build() + .build() - data.forEach { - mutableListOf.add(it) - } - - - - build.setPicker(mutableListOf) - - build.show() + pvOptions.setPicker(opt1 as List?,opt2 as List?) + pvOptions.show() } })) +// DataManager.getInstance().companyLst("YJ0007") +// .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) +// tvSpdw.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() +// +// } +// })) + } @@ -286,7 +339,7 @@ class ApplyActivity : BaseActivity(), View.OnClickListener { fun sub() { - if (!::curCompanyBean.isInitialized || !::jb.isInitialized || + if (!::childSign.isInitialized || !::jb.isInitialized || !::shi.isInitialized || etQymc.text.toString().isNullOrEmpty() || etLxr.text.toString().isNullOrEmpty() || etPhone.text.toString().isNullOrEmpty() || etCl.text.toString().isNullOrEmpty() || etTxz.text.toString().isNullOrEmpty() @@ -296,7 +349,7 @@ class ApplyActivity : BaseActivity(), View.OnClickListener { } val applySendBean = ApplySendBean() - applySendBean.sign = curCompanyBean.sign + applySendBean.sign = childSign applySendBean.enterpriseName = etQymc.text.toString() // applySendBean.typeId = curCompanyType.typeId applySendBean.provinceName = sheng diff --git a/app/src/main/res/drawable/shape_gray_bg20.xml b/app/src/main/res/drawable/shape_gray_bg20.xml new file mode 100644 index 0000000..c8e79fd --- /dev/null +++ b/app/src/main/res/drawable/shape_gray_bg20.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_go.xml b/app/src/main/res/layout/activity_add_go.xml index 3eb4e4a..e39e758 100644 --- a/app/src/main/res/layout/activity_add_go.xml +++ b/app/src/main/res/layout/activity_add_go.xml @@ -29,6 +29,7 @@ android:padding="6dp"> + + + android:textSize="16dp"/> @@ -177,7 +177,7 @@ android:paddingLeft="7dp" android:text="修改手机号" android:textColor="@color/color_3" - android:textSize="@dimen/text_16sp" /> + android:textSize="16dp" /> @@ -219,7 +219,7 @@ android:paddingLeft="7dp" android:text="隐私协议" android:textColor="@color/color_3" - android:textSize="@dimen/text_16sp" /> + android:textSize="16dp"/> @@ -236,6 +236,7 @@ android:gravity="bottom">