From 1a18808e3fcb9d0aa45f85a90a61f94c75fdfc21 Mon Sep 17 00:00:00 2001 From: itgaojian163 Date: Thu, 4 Nov 2021 20:54:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E5=85=AC=E7=BB=84=E7=BB=87=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 2 +- .idea/jarRepositories.xml | 5 + .idea/misc.xml | 2 +- .../orgmanage/NonPublicOrgAddActivity.java | 88 +- .../layout/activity_non_public_org_add.xml | 3 + .../layout/activity_non_public_org_detail.xml | 953 +++++++++++++++++- .../mainmodule/base/LoginActivity.java | 13 +- 7 files changed, 1054 insertions(+), 12 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..7e7ee62 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 5d20b21..8bf9957 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -36,5 +36,10 @@ - + diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgAddActivity.java index df49265..94e67d0 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgAddActivity.java @@ -128,6 +128,8 @@ public class NonPublicOrgAddActivity extends BaseActivity { SwitchCompat mSwHasLabour; @BindView(R2.id.sw_has_party) SwitchCompat mSwHasParty; + @BindView(R2.id.et_labour_count) + EditText mEtLabourCount; @BindView(R2.id.sw_has_women) SwitchCompat mSwHasWomen; @BindView(R2.id.tv_danger_type) @@ -166,6 +168,10 @@ public class NonPublicOrgAddActivity extends BaseActivity { RecyclerView mRlvWorkPhoto; @BindView(R2.id.et_remark) EditText mEtRemark; + @BindView(R2.id.et_legal_name) + EditText mEtLegalName; + @BindView(R2.id.et_legal_phone) + EditText mEtLegalPhone; @BindView(R2.id.nsv_content) NestedScrollView mNsvContent; private Unbinder mBind; @@ -236,6 +242,7 @@ public class NonPublicOrgAddActivity extends BaseActivity { * 7 工作场所 */ private void initViews() { + initMap(); mTvArea.setOnClickListener(v -> onShowArea()); mTvGrid.setOnClickListener(v -> { if (TextUtils.isEmpty(mSelAreaCode)) { @@ -826,7 +833,86 @@ public class NonPublicOrgAddActivity extends BaseActivity { ids = ids.substring(0, ids.length() - 1); bean.setFacadePhotos(ids); } - + bean.setHasLabourUnion(mHasLabour); + bean.setHasPartyOrg(mHasParty); + bean.setHasWomenFederation(mHasWomen); + if (mSelDanger != null) { + bean.setHiddenDangerTypeId(mSelDanger.getDataId()); + bean.setHiddenDangerTypeId(mSelDanger.getDataName()); + } + bean.setIsDanger(mIsDanger); + bean.setIsLogOff(mIsLogOff); + String labourCount = mEtLabourCount.getText().toString().trim(); + if (!TextUtils.isEmpty(labourCount)) { + bean.setLabourUnionTotalPerson(Integer.parseInt(labourCount)); + } + if (mSelCardType != null) { + bean.setLegalPersonIdCardCode(mSelCardType.getDataId()); + } + String legalNumber = mEtLegalNumber.getText().toString().trim(); + if (!TextUtils.isEmpty(legalNumber)) { + bean.setLegalPersonIdCard(legalNumber); + } + String legalName = mEtLegalName.getText().toString().trim(); + if (!TextUtils.isEmpty(legalName)) { + bean.setLegalPersonName(legalName); + } + String legalPhone = mEtLegalPhone.getText().toString().trim(); + if (!TextUtils.isEmpty(legalPhone)) { + bean.setLegalPersonPhone(legalPhone); + } + if (!TextUtils.isEmpty(mLegalZPhotoId)) { + bean.setLegalPersonIdCardFront(mLegalZPhotoId); + } + if (!TextUtils.isEmpty(mLegalFPhotoId)) { + bean.setLegalPersonIdCardBack(mLegalFPhotoId); + } + String masterName = mEtMasterName.getText().toString().trim(); + if (!TextUtils.isEmpty(masterName)) { + bean.setMasterName(masterName); + } + String masterPhone = mEtMasterPhone.getText().toString().trim(); + if (!TextUtils.isEmpty(masterPhone)) { + bean.setMasterPhone(masterPhone); + } + String masterIdCard = mEtMasterIdCard.getText().toString().trim(); + if (!TextUtils.isEmpty(masterIdCard)) { + bean.setMasterIdCard(masterIdCard); + } + if (!TextUtils.isEmpty(mMasterZPhotoId)) { + bean.setMasterIdCardFromt(mMasterZPhotoId); + } + if (!TextUtils.isEmpty(mMasterFPhotoId)) { + bean.setMasterIdCardBack(mMasterFPhotoId); + } + String securityName = mEtSecurityName.getText().toString().trim(); + if (!TextUtils.isEmpty(securityName)) { + bean.setSecurityPersonName(securityName); + } + String securityPhone = mEtSecurityPhone.getText().toString().trim(); + if (!TextUtils.isEmpty(securityPhone)) { + bean.setSecurityPersonPhone(securityPhone); + } + String workerCount = mEtCompanyCount.getText().toString().trim(); + if (!TextUtils.isEmpty(workerCount)) { + bean.setTotalPerson(Integer.parseInt(workerCount)); + } + String womanCount = mEtCompanyWomanCount.getText().toString().trim(); + if (!TextUtils.isEmpty(womanCount)) { + bean.setWomenTotalPerson(Integer.parseInt(womanCount)); + } + if (mWorkPhotos.size() > 2) { + String ids = ""; + for (int i = 0; i < mWorkPhotos.size(); i++) { + ids += mWorkPhotos.get(i).getId() + ","; + } + ids = ids.substring(0, ids.length() - 1); + bean.setWorkplacePhotos(ids); + } + String remark = mEtRemark.getText().toString().trim(); + if (!TextUtils.isEmpty(remark)) { + bean.setRemarks(remark); + } Gson gson = new Gson(); String obj = gson.toJson(bean); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj); diff --git a/gridmodule/src/main/res/layout/activity_non_public_org_add.xml b/gridmodule/src/main/res/layout/activity_non_public_org_add.xml index 764a1a6..384c255 100644 --- a/gridmodule/src/main/res/layout/activity_non_public_org_add.xml +++ b/gridmodule/src/main/res/layout/activity_non_public_org_add.xml @@ -593,6 +593,7 @@ @@ -644,6 +645,7 @@ @@ -660,6 +662,7 @@ diff --git a/gridmodule/src/main/res/layout/activity_non_public_org_detail.xml b/gridmodule/src/main/res/layout/activity_non_public_org_detail.xml index 0b0c5d6..19978f7 100644 --- a/gridmodule/src/main/res/layout/activity_non_public_org_detail.xml +++ b/gridmodule/src/main/res/layout/activity_non_public_org_detail.xml @@ -1,9 +1,954 @@ - + android:background="@color/gray_bg" + android:orientation="vertical" + android:overScrollMode="never" + android:scrollbars="none"> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/LoginActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/LoginActivity.java index c5a63a1..19431f3 100755 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/LoginActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/LoginActivity.java @@ -164,11 +164,14 @@ public class LoginActivity extends BaseActivity { * 登录 */ public void login() { - if (checkUserInputInfo()) { - String userName = mEtUserPhone.getText().toString().trim(); - String pwd = mEtUserPwd.getText().toString().trim(); - doLoginApp(userName, pwd); - } + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_NON_PUBLIC_ORG_ADD) + .navigation(); +// if (checkUserInputInfo()) { +// String userName = mEtUserPhone.getText().toString().trim(); +// String pwd = mEtUserPwd.getText().toString().trim(); +// doLoginApp(userName, pwd); +// } } /**