diff --git a/app/build.gradle b/app/build.gradle index b011027..b9f9731 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ dependencies { implementation project(':cm_utils') implementation project(':camera') //百度地图 -// implementation files('libs/BaiduLBS_Android.jar') + implementation files('libs/BaiduLBS_Android.jar') // implementation files('libs/IndoorscapeAlbumPlugin.jar') //极光推送 // implementation files('libs/jcore-android-2.0.1.jar') diff --git a/app/libs/BaiduLBS_Android.jar b/app/libs/BaiduLBS_Android.jar new file mode 100644 index 0000000..0fd511e Binary files /dev/null and b/app/libs/BaiduLBS_Android.jar differ diff --git a/app/libs/arm64-v8a/libBaiduMapSDK_base_v6_2_0.so b/app/libs/arm64-v8a/libBaiduMapSDK_base_v6_2_0.so new file mode 100644 index 0000000..7359c6e Binary files /dev/null and b/app/libs/arm64-v8a/libBaiduMapSDK_base_v6_2_0.so differ diff --git a/app/libs/arm64-v8a/libBaiduMapSDK_map_v6_2_0.so b/app/libs/arm64-v8a/libBaiduMapSDK_map_v6_2_0.so new file mode 100644 index 0000000..f23bcc1 Binary files /dev/null and b/app/libs/arm64-v8a/libBaiduMapSDK_map_v6_2_0.so differ diff --git a/app/libs/arm64-v8a/libindoor.so b/app/libs/arm64-v8a/libindoor.so new file mode 100644 index 0000000..bfb6f75 Binary files /dev/null and b/app/libs/arm64-v8a/libindoor.so differ diff --git a/app/libs/arm64-v8a/liblocSDK8a.so b/app/libs/arm64-v8a/liblocSDK8a.so new file mode 100644 index 0000000..cd47e16 Binary files /dev/null and b/app/libs/arm64-v8a/liblocSDK8a.so differ diff --git a/app/libs/armeabi-v7a/libBaiduMapSDK_base_v6_2_0.so b/app/libs/armeabi-v7a/libBaiduMapSDK_base_v6_2_0.so new file mode 100644 index 0000000..f305c40 Binary files /dev/null and b/app/libs/armeabi-v7a/libBaiduMapSDK_base_v6_2_0.so differ diff --git a/app/libs/armeabi-v7a/libBaiduMapSDK_map_v6_2_0.so b/app/libs/armeabi-v7a/libBaiduMapSDK_map_v6_2_0.so new file mode 100644 index 0000000..637d42b Binary files /dev/null and b/app/libs/armeabi-v7a/libBaiduMapSDK_map_v6_2_0.so differ diff --git a/app/libs/armeabi-v7a/libindoor.so b/app/libs/armeabi-v7a/libindoor.so new file mode 100644 index 0000000..b59be91 Binary files /dev/null and b/app/libs/armeabi-v7a/libindoor.so differ diff --git a/app/libs/armeabi-v7a/liblocSDK8a.so b/app/libs/armeabi-v7a/liblocSDK8a.so new file mode 100644 index 0000000..0c6e58c Binary files /dev/null and b/app/libs/armeabi-v7a/liblocSDK8a.so differ diff --git a/app/libs/armeabi/libBaiduMapSDK_base_v6_2_0.so b/app/libs/armeabi/libBaiduMapSDK_base_v6_2_0.so new file mode 100644 index 0000000..e646abb Binary files /dev/null and b/app/libs/armeabi/libBaiduMapSDK_base_v6_2_0.so differ diff --git a/app/libs/armeabi/libBaiduMapSDK_map_v6_2_0.so b/app/libs/armeabi/libBaiduMapSDK_map_v6_2_0.so new file mode 100644 index 0000000..45e4a7b Binary files /dev/null and b/app/libs/armeabi/libBaiduMapSDK_map_v6_2_0.so differ diff --git a/app/libs/armeabi/libindoor.so b/app/libs/armeabi/libindoor.so new file mode 100644 index 0000000..a0879cf Binary files /dev/null and b/app/libs/armeabi/libindoor.so differ diff --git a/app/libs/armeabi/liblocSDK8a.so b/app/libs/armeabi/liblocSDK8a.so new file mode 100644 index 0000000..5286996 Binary files /dev/null and b/app/libs/armeabi/liblocSDK8a.so differ diff --git a/app/libs/x86/libBaiduMapSDK_base_v6_2_0.so b/app/libs/x86/libBaiduMapSDK_base_v6_2_0.so new file mode 100644 index 0000000..4f199b4 Binary files /dev/null and b/app/libs/x86/libBaiduMapSDK_base_v6_2_0.so differ diff --git a/app/libs/x86/libBaiduMapSDK_map_v6_2_0.so b/app/libs/x86/libBaiduMapSDK_map_v6_2_0.so new file mode 100644 index 0000000..1b2cec2 Binary files /dev/null and b/app/libs/x86/libBaiduMapSDK_map_v6_2_0.so differ diff --git a/app/libs/x86/libindoor.so b/app/libs/x86/libindoor.so new file mode 100644 index 0000000..1de0a2c Binary files /dev/null and b/app/libs/x86/libindoor.so differ diff --git a/app/libs/x86/liblocSDK8a.so b/app/libs/x86/liblocSDK8a.so new file mode 100644 index 0000000..cc24465 Binary files /dev/null and b/app/libs/x86/liblocSDK8a.so differ diff --git a/app/libs/x86_64/libBaiduMapSDK_base_v6_2_0.so b/app/libs/x86_64/libBaiduMapSDK_base_v6_2_0.so new file mode 100644 index 0000000..30d56b8 Binary files /dev/null and b/app/libs/x86_64/libBaiduMapSDK_base_v6_2_0.so differ diff --git a/app/libs/x86_64/libBaiduMapSDK_map_v6_2_0.so b/app/libs/x86_64/libBaiduMapSDK_map_v6_2_0.so new file mode 100644 index 0000000..143c80f Binary files /dev/null and b/app/libs/x86_64/libBaiduMapSDK_map_v6_2_0.so differ diff --git a/app/libs/x86_64/libindoor.so b/app/libs/x86_64/libindoor.so new file mode 100644 index 0000000..80a00c6 Binary files /dev/null and b/app/libs/x86_64/libindoor.so differ diff --git a/app/libs/x86_64/liblocSDK8a.so b/app/libs/x86_64/liblocSDK8a.so new file mode 100644 index 0000000..b66eb9a Binary files /dev/null and b/app/libs/x86_64/liblocSDK8a.so differ diff --git a/app/release/output.json b/app/release/output.json index f72fe2b..bf5ffe2 100755 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"1.0.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"1.0.4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/release/yj-zs-2.apk b/app/release/yj-zs-2.apk new file mode 100644 index 0000000..5843f39 Binary files /dev/null and b/app/release/yj-zs-2.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a231109..42076e3 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,8 +47,15 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning"> - - + + + --> + android:value="pYx5soXOQToimEzEL1QbI6wz9G4B9dkb" /> @@ -360,10 +367,10 @@ - - - - + diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/LoginActivity.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/LoginActivity.java index 56bd0fc..47a1f76 100755 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/LoginActivity.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/LoginActivity.java @@ -90,7 +90,6 @@ public class LoginActivity extends BaseActivity { refreshView(STATE_LOAD_SUCCESS); mRlNotify.setVisibility(View.GONE); mBtnConfirm.setOnClickListener(v -> login()); -// mTvChangePwd.setOnClickListener(v -> ToastUtils.showShort("请联系管理员")); isRememberPwd = UserLgUtils.getCheckRemember(); mCbRemember.setChecked(isRememberPwd); mCbRemember.setOnCheckedChangeListener((compoundButton, b) -> { diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/MainActivity.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/MainActivity.java index 6e8da64..5e3b723 100755 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/MainActivity.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/MainActivity.java @@ -32,6 +32,7 @@ import com.sucstepsoft.txrealtimelocation.activitys.companylib.MineCompanyLibAct import com.sucstepsoft.txrealtimelocation.activitys.countercheck.CounterCheckMainActivity; import com.sucstepsoft.txrealtimelocation.activitys.issue.HistoryDetialActivity; import com.sucstepsoft.txrealtimelocation.activitys.issue.HistoryListActivity; +import com.sucstepsoft.txrealtimelocation.activitys.issue.NewCheckOptionsActivity; import com.sucstepsoft.txrealtimelocation.activitys.issue.PublicAreaActivity; import com.sucstepsoft.txrealtimelocation.activitys.lawlib.LawLibActivity; import com.sucstepsoft.txrealtimelocation.activitys.companylib.CompanyLibActivity; @@ -45,6 +46,7 @@ import com.sucstepsoft.txrealtimelocation.adapters.FunctionAdapter; import com.sucstepsoft.txrealtimelocation.beans.AppTokenUser; import com.sucstepsoft.txrealtimelocation.beans.VersionBean; import com.sucstepsoft.txrealtimelocation.net.LocationApiService; +import com.sucstepsoft.txrealtimelocation.utils.GpsUtils; import java.io.File; import java.util.ArrayList; @@ -99,7 +101,9 @@ public class MainActivity extends BaseActivity { PermissionConstants.STORAGE, PermissionConstants.PHONE, PermissionConstants.MICROPHONE, + PermissionConstants.LOCATION }; + private static final int GPS_REQUEST_CODE = 1234; private Unbinder mBind; private List mFuncs = new ArrayList<>(); private String[] mBtnStrs = new String[]{"企业信息", "隐患上报", "隐患复查", "我的任务", "公共区域", "法律法规"}; @@ -134,6 +138,11 @@ public class MainActivity extends BaseActivity { } }).request(); initBaseView(); + boolean oPen = GpsUtils.isOPen(mActivity); + LogUtils.e(oPen); + if (!oPen) { + openGpsSetting(); + } } @@ -163,6 +172,7 @@ public class MainActivity extends BaseActivity { Intent intent = null; switch (bean.getText()) { case "企业信息": +// intent = new Intent(this, NewCheckOptionsActivity.class); intent = new Intent(this, CompanyLibActivity.class); break; case "隐患上报": @@ -212,6 +222,28 @@ public class MainActivity extends BaseActivity { checkPermission(); } + private AlertDialog mGpsSettingDialog; + + + /** + * 打开GPS + */ + private void openGpsSetting() { + if (mGpsSettingDialog == null) { + mGpsSettingDialog = new AlertDialog.Builder(this).setTitle("打开GPS") + .setMessage("定位需要打开GPS,请前往设置") + .setNegativeButton("取消", (dialogInterface, i) -> dialogInterface.dismiss()) + .setPositiveButton("前往", (dialogInterface, i) -> { + Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS); + startActivityForResult(intent, GPS_REQUEST_CODE); + }) + .setCancelable(false) + .create(); + } + if (!mGpsSettingDialog.isShowing()) { + mGpsSettingDialog.show(); + } + } private void checkPermission() { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) { diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/companylib/EnterCompanyInfoActivity.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/companylib/EnterCompanyInfoActivity.java index 28d35ae..56d10b5 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/companylib/EnterCompanyInfoActivity.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/companylib/EnterCompanyInfoActivity.java @@ -235,6 +235,96 @@ public class EnterCompanyInfoActivity extends BaseActivity { mTvRisk.setOnClickListener(v -> onShowRiskPicker()); mTvTrade.setOnClickListener(v -> onShowTradePicker()); mTvTrade1.setOnClickListener(v -> onShowTrade1Picker()); + getDefaultArea1(); + } + + + /** + * 获取默认省份 + */ + private void getDefaultArea1() { + ProgressDialog progressDialog = UIUtil.initDialog(mActivity, "获取数据中..."); + progressDialog.setCanceledOnTouchOutside(false); + progressDialog.setCancelable(false); + progressDialog.show(); + RetrofitManager.getInstance() + .create(LocationApiService.class) + .getDicrList(PathConfig.DIC_AREA_ID, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(List dictBeans) { + if (dictBeans != null && dictBeans.size() > 0) { + for (int i = 0; i < dictBeans.size(); i++) { + if (dictBeans.get(i).getDictionaryId().equals(PathConfig.DEFAULT_PROVINCE_AREA)) { + mTvArea1.setText(dictBeans.get(i).getDictionaryName()); + mSelArea1Id = dictBeans.get(i).getDictionaryId(); + getDefaultArea2(progressDialog, dictBeans.get(i).getDictionaryId()); + break; + } + } + } + } + + @Override + public void onError(Throwable e) { + ToastUtils.showShort("获取数据失败,请稍后重试"); + progressDialog.dismiss(); + } + + @Override + public void onComplete() { + + } + }); + } + + /** + * 获取默认市 + */ + private void getDefaultArea2(ProgressDialog progressDialog, String id) { + RetrofitManager.getInstance() + .create(LocationApiService.class) + .getDicrList(id, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(List dictBeans) { + progressDialog.dismiss(); + if (dictBeans != null && dictBeans.size() > 0) { + for (int i = 0; i < dictBeans.size(); i++) { + if (dictBeans.get(i).getDictionaryId().equals(PathConfig.DEFAULT_CITY_AREA)) { + mTvArea2.setText(dictBeans.get(i).getDictionaryName()); + mSelArea2Id = dictBeans.get(i).getDictionaryId(); + break; + } + } + } + } + + @Override + public void onError(Throwable e) { + ToastUtils.showShort("获取数据失败,请稍后重试"); + progressDialog.dismiss(); + } + + @Override + public void onComplete() { + + } + }); } private void onShowTrade1Picker() { @@ -460,7 +550,10 @@ public class EnterCompanyInfoActivity extends BaseActivity { submitBean.setIndustryType(mSelTrade1); - submitBean.setBussinessRegNum(code); + code = mEtCompanyCode.getText().toString().trim(); + if (!TextUtils.isEmpty(code)) { + submitBean.setBussinessRegNum(code); + } submitBean.setLegalPerson(companP); submitBean.setSummary(scope); @@ -515,11 +608,11 @@ public class EnterCompanyInfoActivity extends BaseActivity { ToastUtils.showShort("请输入企业名称"); return false; } - code = mEtCompanyCode.getText().toString().trim(); - if (TextUtils.isEmpty(code)) { - ToastUtils.showShort("请输入组织机构代码"); - return false; - } +// code = mEtCompanyCode.getText().toString().trim(); +// if (TextUtils.isEmpty(code)) { +// ToastUtils.showShort("请输入组织机构代码"); +// return false; +// } scope = mEtCompanyScope.getText().toString().trim(); if (TextUtils.isEmpty(scope)) { ToastUtils.showShort("请输入营业范围"); diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/countercheck/CounterCheckOptionsActivity.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/countercheck/CounterCheckOptionsActivity.java index 274ea16..019b847 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/countercheck/CounterCheckOptionsActivity.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/countercheck/CounterCheckOptionsActivity.java @@ -8,30 +8,46 @@ import android.os.Build; import android.os.Bundle; import android.provider.MediaStore; import android.support.v4.content.FileProvider; +import android.support.v7.widget.AppCompatSpinner; +import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.Gravity; import android.view.View; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.RadioGroup; import android.widget.TextView; +import com.baidu.location.BDAbstractLocationListener; +import com.baidu.location.BDLocation; +import com.baidu.location.LocationClient; +import com.baidu.location.LocationClientOption; import com.google.gson.Gson; import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.core.beans.AddPhotoBean; import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; +import com.sucstepsoft.cm_utils.core.widget.base.AddPhotoAdapter; import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity; import com.sucstepsoft.cm_utils.core.widget.views.ButtomDialogView; +import com.sucstepsoft.cm_utils.utils.LogUtils; import com.sucstepsoft.cm_utils.utils.ProiderUtil; import com.sucstepsoft.cm_utils.utils.ToastUtils; import com.sucstepsoft.cm_utils.utils.UIUtil; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.sucstepsoft.txrealtimelocation.R; import com.sucstepsoft.txrealtimelocation.activitys.common.PhotoActivity; +import com.sucstepsoft.txrealtimelocation.activitys.issue.NewCheckOptionsActivity; +import com.sucstepsoft.txrealtimelocation.activitys.issue.demo.NewOptions; +import com.sucstepsoft.txrealtimelocation.activitys.issue.demo.NewOptionsAdapter; import com.sucstepsoft.txrealtimelocation.activitys.issue.demo.Options; import com.sucstepsoft.txrealtimelocation.adapters.CounterCheckOptionsAdapter; import com.sucstepsoft.txrealtimelocation.beans.BaseUserBean; +import com.sucstepsoft.txrealtimelocation.beans.CheckOptionsbean; import com.sucstepsoft.txrealtimelocation.beans.CounterCheckOptionsBean; import com.sucstepsoft.txrealtimelocation.beans.OptionsSubmitBean; import com.sucstepsoft.txrealtimelocation.beans.SuccessBean; @@ -62,7 +78,7 @@ public class CounterCheckOptionsActivity extends BaseActivity { @BindView(R.id.tv_peo) TextView mTvPeo; private Unbinder mBind; - private List mOptions; + private List mOptions; @BindView(R.id.rlv_options) RecyclerView mRlvOptions; @BindView(R.id.btn_unclaim) @@ -72,10 +88,32 @@ public class CounterCheckOptionsActivity extends BaseActivity { private CounterCheckOptionsAdapter mAdapter; private String mCompanyId; private ProgressDialog mMProgressDialog; - private Options mCurrentOptions; - private int mCurrentIndex = 0; private String mCheckId; + + @BindView(R.id.ll_company_info) + LinearLayout mLlCompanyInfo; + @BindView(R.id.ll_state_dis) + LinearLayout mLlStateDis; + @BindView(R.id.rg_term) + RadioGroup mRgTerm; + @BindView(R.id.sp_term) + AppCompatSpinner mSpTerm; + @BindView(R.id.rlv_photos) + RecyclerView mRlvPhotos; + private LocationClient mLocationClient; + private String[] mNowStrings; + private String[] mTermStrings; + private ArrayAdapter mTermAdapter; + private ArrayAdapter mNowAdapter; + private AddPhotoAdapter mAddPhotoAdapter; + private List mPhotos; + private String mPhotoIds = ""; + private int mType = 1;//整改方式 + private String mSelType = "";//整改期限 + private double mCurrentLatitude = 0.0d; + private double mCurrentLongitude = 0.0d; + @Override protected int setLayoutId() { return R.layout.activity_counter_check_options; @@ -100,13 +138,94 @@ public class CounterCheckOptionsActivity extends BaseActivity { mAdapter = new CounterCheckOptionsAdapter(mActivity, mOptions); mRlvOptions.setAdapter(mAdapter); mRlvOptions.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); - mAdapter.addSelectPhotoListener((bean, options, i, type) -> { - mCurrentOptions = options; - if (type == 1) { - //选择图片 - mCurrentIndex = i; + mLlStateDis.setVisibility(View.GONE); + mAdapter.setStateChangeListener(isCheck -> { + if (isCheck) { + //存在检查不合格项 + mLlStateDis.setVisibility(View.VISIBLE); + } else { + //不存在 + mLlStateDis.setVisibility(View.GONE); + } + }); + startListenerLocation(); + getCounterCheckOptions(mCheckId); + + mNowStrings = mActivity.getResources().getStringArray(R.array.limit); + mTermStrings = mActivity.getResources().getStringArray(R.array.timeLimit); + mBtnUnclaim.setOnClickListener(v -> doUnclaim()); + mTermAdapter = new ArrayAdapter<>(mActivity, R.layout.item_pop_text, mTermStrings); + mNowAdapter = new ArrayAdapter<>(mActivity, R.layout.item_pop_text, mNowStrings); + mSpTerm.setAdapter(mNowAdapter); + mSpTerm.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int i, long l) { + mSelType = mNowStrings[i]; + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + mRgTerm.setOnCheckedChangeListener((radioGroup, i) -> { + switch (i) { + case R.id.rb_now: + //立即整改 + mSpTerm.setVisibility(View.VISIBLE); + mSpTerm.setAdapter(mNowAdapter); + mSpTerm.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int i, long l) { + mSelType = mNowStrings[i]; + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + mType = 1; + break; + case R.id.rb_coor: + //不配合 + mSpTerm.setVisibility(View.GONE); + mType = 3; + break; + case R.id.rb_term: + //限期整改 + mType = 2; + mSpTerm.setVisibility(View.VISIBLE); + mSpTerm.setAdapter(mTermAdapter); + mSpTerm.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int i, long l) { + mSelType = mTermStrings[i]; + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + break; + } + }); + mPhotos = new ArrayList<>(); + mPhotos.add(new AddPhotoBean()); + mAddPhotoAdapter = new AddPhotoAdapter(this, mPhotos); + mRlvPhotos.setLayoutManager(new GridLayoutManager(mActivity, 4)); + mRlvPhotos.setAdapter(mAddPhotoAdapter); + //删除上传的相片 + mAddPhotoAdapter.addOnDeleteListener(((bean, i) -> { + mAddPhotoAdapter.removeItem(bean); + mPhotoIds = mPhotoIds.replace(bean.getId() + ",", ""); + })); + mAddPhotoAdapter.addOnItemClickListener(bean -> { + if (TextUtils.isEmpty(bean.getPath())) { + //空数据 showSelectPhoto(bean); - } else if (type == 2) { + } else { //预览 ArrayList list = new ArrayList<>(); list.add(bean.getPath()); @@ -114,26 +233,8 @@ public class CounterCheckOptionsActivity extends BaseActivity { intent.putExtra(PhotoActivity.TAG_IMGURL, list); intent.setClass(mActivity, PhotoActivity.class); startActivity(intent); - } else { - List photos = mAdapter.getData().get(i).getPhotos(); - if (photos.size() == 4) { - boolean isExist = false; - for (int j = 0; j < photos.size(); j++) { - AddPhotoBean photoBean = photos.get(j); - if (TextUtils.isEmpty(photoBean.getId())) { - isExist = true; - } - } - if (!isExist) { - mAdapter.getData().get(i).getPhotos().add(new AddPhotoBean()); - } - } - photos.remove(bean); - mAdapter.notifyDataSetChanged(); } }); - getCounterCheckOptions(mCheckId); - mBtnUnclaim.setOnClickListener(v -> doUnclaim()); } private void doUnclaim() { @@ -219,72 +320,90 @@ public class CounterCheckOptionsActivity extends BaseActivity { * * @param data */ - private void buildConfirmData(List data) { + private void buildConfirmData(List data) { mMProgressDialog = new ProgressDialog(mActivity); - mMProgressDialog.setMessage("加载中..."); + mMProgressDialog.setMessage("上报中..."); mMProgressDialog.setCancelable(false); mMProgressDialog.setCanceledOnTouchOutside(false); mMProgressDialog.show(); - OptionsSubmitBean submitBean = new OptionsSubmitBean(); - submitBean.setEnterpriseId(mCompanyId); - submitBean.setCheckType(2); - submitBean.setIsCoordination(1); - List items = new ArrayList<>(); - for (int i = 0; i < data.size(); i++) { - Options o = data.get(i); - if (o.getIsMust() == 1) { - if (o.getState() == EmStateCheck.NORMAL) { - mMProgressDialog.dismiss(); - ToastUtils.showShort("检查项中存在未检查的必查项目"); - return; - } - } - OptionsSubmitBean.HiddenDangerReportsBean bean = new OptionsSubmitBean.HiddenDangerReportsBean(); - bean.setCheckItemId(o.getId()); - String photoIds = ""; - if (o.getState() == EmStateCheck.NORMAL) { - bean.setCheckResult(0); - } else if (o.getState() == EmStateCheck.CHECK) { - bean.setCheckResult(1); - for (int j = 0; j < o.getPhotos().size(); j++) { - if (!TextUtils.isEmpty(o.getPhotos().get(j).getId())) { - photoIds += o.getPhotos().get(j).getId() + ","; + + if (checkConfirmParams(data)) { + OptionsSubmitBean submitBean = new OptionsSubmitBean(); + submitBean.setEnterpriseId(mCompanyId); + submitBean.setCheckType(1); + submitBean.setIsCoordination(1); + List items = new ArrayList<>(); + for (int i = 0; i < data.size(); i++) { + NewOptions o = data.get(i); + List child = data.get(i).getChild(); + for (int j = 0; j < child.size(); j++) { + if (child.get(j).getType() == 1) { + //选择 + if (child.get(j).isCheck()) { + OptionsSubmitBean.HiddenDangerReportsBean bean = new OptionsSubmitBean.HiddenDangerReportsBean(); + bean.setCheckItemId(o.getId()); + bean.setCheckItemOptionId(child.get(j).getItemId()); + bean.setCheckResult(child.get(j).getItemId()); + bean.setType(child.get(j).getType()); + items.add(bean); + } + } else { + //输入 + OptionsSubmitBean.HiddenDangerReportsBean bean = new OptionsSubmitBean.HiddenDangerReportsBean(); + bean.setCheckItemId(o.getId()); + bean.setCheckItemOptionId(child.get(j).getItemId()); + bean.setType(child.get(j).getType()); + if (TextUtils.isEmpty(child.get(j).getInputText())) { + bean.setCheckResult(""); + } else { + bean.setCheckResult(child.get(j).getInputText()); + } + items.add(bean); } } - if (photoIds.length() > 10) { - bean.setScenePhotos(photoIds); + } + + + if (mType == 1) { + submitBean.setRectificationType(1); + //立即整改 + if (mSelType.equals("当场整改")) { + submitBean.setImmediatelyChangeType(1); + } else { + submitBean.setImmediatelyChangeType(2); } } else { - if (o.getRectify() == 4) { - //立即整改 - bean.setCheckResult(2); - if (o.getTimeLimit().equals("立即整改")) { - bean.setImmediatelyChangeType(1); - } else { - bean.setImmediatelyChangeType(2); - } - } else if (o.getRectify() == 5) { - //限期整改 - bean.setCheckResult(3); - String strDay = o.getTimeLimit().substring(0, o.getTimeLimit().lastIndexOf("天")); - bean.setRectificationDays(Integer.parseInt(strDay)); - } else { - //不配合 - bean.setCheckResult(4); - } - for (int j = 0; j < o.getPhotos().size(); j++) { - if (!TextUtils.isEmpty(o.getPhotos().get(j).getId())) { - photoIds += o.getPhotos().get(j).getId() + ","; - } - } - if (photoIds.length() > 10) { - bean.setScenePhotos(photoIds); - } + submitBean.setRectificationType(2); + String strDay = mSelType.substring(0, mSelType.lastIndexOf("天")); + submitBean.setRectificationDays(Integer.parseInt(strDay)); } - items.add(bean); + if (!TextUtils.isEmpty(mPhotoIds)) { + submitBean.setScenePhotos(mPhotoIds); + } + submitBean.setHiddenDangerReports(items); + submitBean.setCheckLat(mCurrentLatitude + ""); + submitBean.setCheckLng(mCurrentLongitude + ""); + doSubmit(submitBean); + } else { + mMProgressDialog.dismiss(); + ToastUtils.showShort("检查项中存在未检查的项目"); } - submitBean.setHiddenDangerReports(items); - doSubmit(submitBean); + } + + /** + * 校验参数是否合法 + * + * @return + */ + private boolean checkConfirmParams(List data) { + boolean isComplete = true; + for (int i = 0; i < data.size(); i++) { + if (data.get(i).getState() == EmStateCheck.NORMAL) { + isComplete = false; + break; + } + } + return isComplete; } /** @@ -458,11 +577,12 @@ public class CounterCheckOptionsActivity extends BaseActivity { } ToastUtils.showShort("上传成功"); mCurrentBean.setId(baseUserBean.getData()); + mPhotoIds += baseUserBean.getData() + ","; mCurrentBean.setPath(picPath); - if (mCurrentOptions.getPhotos().size() < 4) { - mCurrentOptions.getPhotos().add(new AddPhotoBean()); + if (mPhotos.size() < 9) { + mPhotos.add(new AddPhotoBean()); } - mAdapter.notifyDataSetChanged(); + mAddPhotoAdapter.notifyDataSetChanged(); mCurrentBean = null; } @@ -499,14 +619,78 @@ public class CounterCheckOptionsActivity extends BaseActivity { for (int i = 0; i < checkOptionsbeans.size(); i++) { List mPhotos = new ArrayList<>(); mPhotos.add(new AddPhotoBean()); - Options o = new Options(); + NewOptions o = new NewOptions(); + List beans = new ArrayList<>(); + for (int j = 0; j < checkOptionsbeans.get(i).getCheckItemOptions().size(); j++) { + NewOptions.ChildBean bean = new NewOptions.ChildBean(); + CounterCheckOptionsBean.CheckItemOptionsBean optionsBean = checkOptionsbeans.get(i).getCheckItemOptions().get(j); + bean.setId(j); + bean.setItemId(optionsBean.getCheckItemOptionId()); + bean.setTitle(optionsBean.getName()); + bean.setType(optionsBean.getType()); + if (checkOptionsbeans.get(i).getCheckItemOptions().get(j).getIsWrong() == 0) { + bean.setWrong(false); + } else { + bean.setWrong(true); + } + bean.setCheck(false); + beans.add(bean); + } + o.setType(checkOptionsbeans.get(i).getType()); + o.setChild(beans); o.setId(checkOptionsbeans.get(i).getCheckItemId()); o.setTitle(checkOptionsbeans.get(i).getName()); o.setPhotos(mPhotos); + o.setIsMust(checkOptionsbeans.get(i).getType()); mOptions.add(o); } mAdapter.setData(mOptions); refreshView(STATE_LOAD_SUCCESS); } + /** + * 初始化定位参数配置 + */ + + private void startListenerLocation() { + mLocationClient = new LocationClient(getApplicationContext()); + LocationClientOption locationOption = new LocationClientOption(); + MyLocationListener myLocationListener = new MyLocationListener(); + mLocationClient.registerLocationListener(myLocationListener); + locationOption.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy); + locationOption.setCoorType("bd09ll"); + locationOption.setScanSpan(1000); + locationOption.setIsNeedAddress(true); + locationOption.setIsNeedLocationDescribe(true); + locationOption.setNeedDeviceDirect(false); + locationOption.setLocationNotify(true); + locationOption.setIgnoreKillProcess(true); + locationOption.setIsNeedLocationDescribe(true); + locationOption.setIsNeedLocationPoiList(true); + locationOption.SetIgnoreCacheException(false); + locationOption.setOpenGps(true); + locationOption.setIsNeedAltitude(false); + locationOption.setOpenAutoNotifyMode(); + locationOption.setLocationPurpose(LocationClientOption.BDLocationPurpose.SignIn); + locationOption.setOpenAutoNotifyMode(3000, 1, LocationClientOption.LOC_SENSITIVITY_HIGHT); + mLocationClient.setLocOption(locationOption); + mLocationClient.start(); + } + + /** + * 实现定位回调 + */ + public class MyLocationListener extends BDAbstractLocationListener { + @Override + public void onReceiveLocation(BDLocation location) { + double latitude = location.getLatitude(); + double longitude = location.getLongitude(); + float radius = location.getRadius(); + if (latitude != Double.MIN_VALUE && longitude != Double.MIN_VALUE && radius <= 300) { + mCurrentLatitude = latitude; + mCurrentLongitude = longitude; + mLocationClient.stop(); + } + } + } } diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/CheckOptionsActivity.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/CheckOptionsActivity.java index fc6fecc..5a58bb0 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/CheckOptionsActivity.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/CheckOptionsActivity.java @@ -96,6 +96,7 @@ public class CheckOptionsActivity extends BaseActivity { buildConfirmData(mAdapter.getData()); }); String id = getIntent().getStringExtra("id"); + String nId = getIntent().getStringExtra("nId"); mCompanyId = getIntent().getStringExtra("cId"); String name = getIntent().getStringExtra("name"); String peo = getIntent().getStringExtra("peo"); @@ -144,7 +145,7 @@ public class CheckOptionsActivity extends BaseActivity { mAdapter.notifyDataSetChanged(); } }); - getCheckOptions(id); + getCheckOptions(id, nId); mBtnUnclaim.setOnClickListener(v -> doUnclaim()); } @@ -217,52 +218,52 @@ public class CheckOptionsActivity extends BaseActivity { return; } } - OptionsSubmitBean.HiddenDangerReportsBean bean = new OptionsSubmitBean.HiddenDangerReportsBean(); - bean.setCheckItemId(o.getId()); - String photoIds = ""; - if (o.getState() == EmStateCheck.NORMAL) { - bean.setCheckResult(0); - } else if (o.getState() == EmStateCheck.CHECK) { - bean.setCheckResult(1); - for (int j = 0; j < o.getPhotos().size(); j++) { - if (!TextUtils.isEmpty(o.getPhotos().get(j).getId())) { - photoIds += o.getPhotos().get(j).getId() + ","; - } - } - if (photoIds.length() > 10) { - bean.setScenePhotos(photoIds); - } - } else { - if (o.getRectify() == 4) { - //立即整改 - bean.setCheckResult(2); - if (o.getTimeLimit().equals("立即整改")) { - bean.setImmediatelyChangeType(1); - } else { - bean.setImmediatelyChangeType(2); - } - } else if (o.getRectify() == 5) { - //限期整改 - bean.setCheckResult(3); - String strDay = o.getTimeLimit().substring(0, o.getTimeLimit().lastIndexOf("天")); - bean.setRectificationDays(Integer.parseInt(strDay)); - } else { - //不配合 - bean.setCheckResult(4); - } - for (int j = 0; j < o.getPhotos().size(); j++) { - if (!TextUtils.isEmpty(o.getPhotos().get(j).getId())) { - photoIds += o.getPhotos().get(j).getId() + ","; - } - } - if (photoIds.length() > 10) { - bean.setScenePhotos(photoIds); -// mMProgressDialog.dismiss(); -// ToastUtils.showShort("检查项中存在未上传图片的项目"); -// return; - } - } - items.add(bean); +// OptionsSubmitBean.HiddenDangerReportsBean bean = new OptionsSubmitBean.HiddenDangerReportsBean(); +// bean.setCheckItemId(o.getId()); +// String photoIds = ""; +// if (o.getState() == EmStateCheck.NORMAL) { +// bean.setCheckResult(0); +// } else if (o.getState() == EmStateCheck.CHECK) { +// bean.setCheckResult(1); +// for (int j = 0; j < o.getPhotos().size(); j++) { +// if (!TextUtils.isEmpty(o.getPhotos().get(j).getId())) { +// photoIds += o.getPhotos().get(j).getId() + ","; +// } +// } +// if (photoIds.length() > 10) { +// bean.setScenePhotos(photoIds); +// } +// } else { +// if (o.getRectify() == 4) { +// //立即整改 +// bean.setCheckResult(2); +// if (o.getTimeLimit().equals("立即整改")) { +// bean.setImmediatelyChangeType(1); +// } else { +// bean.setImmediatelyChangeType(2); +// } +// } else if (o.getRectify() == 5) { +// //限期整改 +// bean.setCheckResult(3); +// String strDay = o.getTimeLimit().substring(0, o.getTimeLimit().lastIndexOf("天")); +// bean.setRectificationDays(Integer.parseInt(strDay)); +// } else { +// //不配合 +// bean.setCheckResult(4); +// } +// for (int j = 0; j < o.getPhotos().size(); j++) { +// if (!TextUtils.isEmpty(o.getPhotos().get(j).getId())) { +// photoIds += o.getPhotos().get(j).getId() + ","; +// } +// } +// if (photoIds.length() > 10) { +// bean.setScenePhotos(photoIds); +//// mMProgressDialog.dismiss(); +//// ToastUtils.showShort("检查项中存在未上传图片的项目"); +//// return; +// } +// } +// items.add(bean); } submitBean.setHiddenDangerReports(items); doSubmit(submitBean); @@ -309,11 +310,11 @@ public class CheckOptionsActivity extends BaseActivity { }); } - private void getCheckOptions(String id) { + private void getCheckOptions(String id, String nId) { refreshView(STATE_LOAD_LOADING); RetrofitManager.getInstance() .create(LocationApiService.class) - .getCheckOptionsList(id, UserLgUtils.getToken()) + .getCheckOptionsList(id, nId, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer>() { diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/HistoryDetialActivity.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/HistoryDetialActivity.java index 401cbc4..7ced4b0 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/HistoryDetialActivity.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/HistoryDetialActivity.java @@ -1,14 +1,24 @@ package com.sucstepsoft.txrealtimelocation.activitys.issue; +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.text.TextUtils; +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; +import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity; +import com.sucstepsoft.cm_utils.core.widget.base.BaseShowPhotoAdapter; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.sucstepsoft.txrealtimelocation.R; +import com.sucstepsoft.txrealtimelocation.activitys.common.PhotoActivity; import com.sucstepsoft.txrealtimelocation.adapters.MissionDetailAdapter; -import com.sucstepsoft.txrealtimelocation.beans.HistoryMissionBean; +import com.sucstepsoft.txrealtimelocation.beans.HistoryDetialBean; import com.sucstepsoft.txrealtimelocation.net.LocationApiService; import java.util.ArrayList; @@ -25,9 +35,18 @@ import io.reactivex.schedulers.Schedulers; public class HistoryDetialActivity extends BaseActivity { @BindView(R.id.rlv_detail) RecyclerView mRlvDetail; - + @BindView(R.id.tv_name) + TextView mTvName; + @BindView(R.id.tv_peo) + TextView mTvPeo; + @BindView(R.id.tv_type) + TextView mTvType; + @BindView(R.id.rlv_photos) + RecyclerView mRlvPhotos; + @BindView(R.id.ll_type) + LinearLayout mLlType; private Unbinder mBind; - private List mDatas = new ArrayList<>(); + private List mDatas = new ArrayList<>(); private MissionDetailAdapter mAdapter; private Disposable mDis; @@ -44,7 +63,13 @@ public class HistoryDetialActivity extends BaseActivity { String cId = getIntent().getStringExtra("cId"); getDetail(cId); mAdapter = new MissionDetailAdapter(mActivity, mDatas); - mRlvDetail.setLayoutManager(new LinearLayoutManager(mActivity)); + LinearLayoutManager linearLayoutManager = new LinearLayoutManager(mActivity) { + @Override + public boolean canScrollVertically() { + return false; + } + }; + mRlvDetail.setLayoutManager(linearLayoutManager); mRlvDetail.setAdapter(mAdapter); } @@ -52,21 +77,87 @@ public class HistoryDetialActivity extends BaseActivity { private void getDetail(String cid) { RetrofitManager.getInstance() .create(LocationApiService.class) - .getHistoryDetail(cid, UserLgUtils.getToken()) + .getHistoryDetailById(cid, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer>() { + .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { mDis = d; } @Override - public void onNext(List beans) { - if (beans != null && beans.size() > 0) { + public void onNext(HistoryDetialBean beans) { + if (beans != null) { refreshView(STATE_LOAD_SUCCESS); - mDatas = beans; - mAdapter.setData(mDatas); + mTvName.setText(beans.getNameJoinByEnterpriseId()); + mTvPeo.setText(beans.getMasterJoinByEnterpriseId()); + if (beans.getIsComplete() == 0) { + if (beans.getRectificationType() == 0) { + mLlType.setVisibility(View.VISIBLE); + if (beans.getImmediatelyChangeType() == 1) { + mTvType.setText("当场整改"); + } else { + mTvType.setText("当天整改"); + } + if (!TextUtils.isEmpty(beans.getScenePhotos())) { + mRlvPhotos.setVisibility(View.VISIBLE); + List photos = new ArrayList<>(); + String[] split = beans.getScenePhotos().split(","); + for (int j = 0; j < split.length; j++) { + if (!TextUtils.isEmpty(split[j])) { + photos.add(BaseUrlApi.BASE_IMG_URL + split[j]); + } + } + BaseShowPhotoAdapter adapter = new BaseShowPhotoAdapter(mActivity, photos); + GridLayoutManager manager = new GridLayoutManager(mActivity, 4); + mRlvPhotos.setLayoutManager(manager); + mRlvPhotos.setAdapter(adapter); + adapter.addOnItemClickListener(url -> { + Intent intent = new Intent(mActivity, PhotoActivity.class); + intent.putExtra("imgUrls", new ArrayList<>(adapter.getData())); + startActivity(intent); + }); + } else { + mRlvPhotos.setVisibility(View.GONE); + } + } else if (beans.getRectificationType() == 2) { + mLlType.setVisibility(View.VISIBLE); + mTvType.setText(beans.getRectificationDays() + "天内整改"); + if (!TextUtils.isEmpty(beans.getScenePhotos())) { + mRlvPhotos.setVisibility(View.VISIBLE); + List photos = new ArrayList<>(); + String[] split = beans.getScenePhotos().split(","); + for (int j = 0; j < split.length; j++) { + if (!TextUtils.isEmpty(split[j])) { + photos.add(BaseUrlApi.BASE_IMG_URL + split[j]); + } + } + BaseShowPhotoAdapter adapter = new BaseShowPhotoAdapter(mActivity, photos); + GridLayoutManager manager = new GridLayoutManager(mActivity, 4); + mRlvPhotos.setLayoutManager(manager); + mRlvPhotos.setAdapter(adapter); + adapter.addOnItemClickListener(url -> { + Intent intent = new Intent(mActivity, PhotoActivity.class); + intent.putExtra("imgUrls", new ArrayList<>(adapter.getData())); + startActivity(intent); + }); + } else { + mRlvPhotos.setVisibility(View.GONE); + } + } else { + mLlType.setVisibility(View.GONE); + } + } else { + mLlType.setVisibility(View.GONE); + } + if (beans.getCheckItems() != null && beans.getCheckItems().size() > 0) { + mRlvDetail.setVisibility(View.VISIBLE); + mDatas = beans.getCheckItems(); + mAdapter.setData(mDatas); + } else { + mRlvDetail.setVisibility(View.GONE); + } } else { refreshView(STATE_LOAD_EMPTY); } @@ -92,4 +183,5 @@ public class HistoryDetialActivity extends BaseActivity { } mBind.unbind(); } + } diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/NewCheckOptionsActivity.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/NewCheckOptionsActivity.java new file mode 100644 index 0000000..b046c17 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/NewCheckOptionsActivity.java @@ -0,0 +1,706 @@ +package com.sucstepsoft.txrealtimelocation.activitys.issue; + +import android.app.ProgressDialog; +import android.content.Intent; +import android.database.Cursor; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.provider.MediaStore; +import android.support.design.widget.AppBarLayout; +import android.support.v4.content.FileProvider; +import android.support.v7.widget.AppCompatSpinner; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.text.TextUtils; +import android.view.Gravity; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.RadioGroup; +import android.widget.TextView; + +import com.baidu.location.BDAbstractLocationListener; +import com.baidu.location.BDLocation; +import com.baidu.location.LocationClient; +import com.baidu.location.LocationClientOption; +import com.google.gson.Gson; +import com.sucstepsoft.cm_utils.constant.PathConfig; +import com.sucstepsoft.cm_utils.core.beans.AddPhotoBean; +import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; +import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; +import com.sucstepsoft.cm_utils.core.widget.base.AddPhotoAdapter; +import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity; +import com.sucstepsoft.cm_utils.core.widget.views.ButtomDialogView; +import com.sucstepsoft.cm_utils.utils.LogUtils; +import com.sucstepsoft.cm_utils.utils.ProiderUtil; +import com.sucstepsoft.cm_utils.utils.ToastUtils; +import com.sucstepsoft.cm_utils.utils.UIUtil; +import com.sucstepsoft.cm_utils.utils.UserLgUtils; +import com.sucstepsoft.txrealtimelocation.R; +import com.sucstepsoft.txrealtimelocation.activitys.common.PhotoActivity; +import com.sucstepsoft.txrealtimelocation.activitys.companylib.EnterCompanyInfoActivity; +import com.sucstepsoft.txrealtimelocation.activitys.issue.demo.NewOptions; +import com.sucstepsoft.txrealtimelocation.activitys.issue.demo.NewOptionsAdapter; +import com.sucstepsoft.txrealtimelocation.activitys.issue.demo.Options; +import com.sucstepsoft.txrealtimelocation.beans.BaseUserBean; +import com.sucstepsoft.txrealtimelocation.beans.CheckItemOption; +import com.sucstepsoft.txrealtimelocation.beans.CheckOptionsbean; +import com.sucstepsoft.txrealtimelocation.beans.OptionsSubmitBean; +import com.sucstepsoft.txrealtimelocation.beans.SuccessBean; +import com.sucstepsoft.txrealtimelocation.net.LocationApiService; +import com.sucstepsoft.txrealtimelocation.widget.EmStateCheck; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; +import io.reactivex.Observer; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; +import io.reactivex.schedulers.Schedulers; +import okhttp3.MediaType; +import okhttp3.MultipartBody; +import okhttp3.RequestBody; +import top.zibin.luban.Luban; +import top.zibin.luban.OnCompressListener; + +public class NewCheckOptionsActivity extends BaseActivity { + + + Unbinder mBind; + @BindView(R.id.tv_name) + TextView mTvName; + @BindView(R.id.btn_unclaim) + Button mBtnUnclaim; + @BindView(R.id.tv_peo) + TextView mTvPeo; + @BindView(R.id.ll_company_info) + LinearLayout mLlCompanyInfo; + @BindView(R.id.rlv_options) + RecyclerView mRlvOptions; + @BindView(R.id.ll_state_dis) + LinearLayout mLlStateDis; + @BindView(R.id.rg_term) + RadioGroup mRgTerm; + @BindView(R.id.sp_term) + AppCompatSpinner mSpTerm; + @BindView(R.id.rlv_photos) + RecyclerView mRlvPhotos; + private AddPhotoBean mCurrentBean; + private String mPicPath; + private List mOptions; + private NewOptionsAdapter mAdapter; + private String mCompanyId; + private ProgressDialog mMProgressDialog; + private LocationClient mLocationClient; + private String[] mNowStrings; + private String[] mTermStrings; + private ArrayAdapter mTermAdapter; + private ArrayAdapter mNowAdapter; + private AddPhotoAdapter mAddPhotoAdapter; + private List mPhotos; + private String mPhotoIds = ""; + private int mType = 1;//整改方式 + private String mSelType = "";//整改期限 + private double mCurrentLatitude = 0.0d; + private double mCurrentLongitude = 0.0d; + + @Override + protected int setLayoutId() { + return R.layout.activity_new_check_options; + } + + @Override + public void initData() { + mBind = ButterKnife.bind(this); + refreshView(STATE_LOAD_SUCCESS); + mTvBaseTitle.setText("企业检查"); + mTvPublish.setVisibility(View.VISIBLE); + mTvPublish.setText("确定"); + mTvPublish.setOnClickListener(v -> { + buildConfirmData(mAdapter.getData()); + }); + startListenerLocation(); + String nId = getIntent().getStringExtra("nId"); + String id = getIntent().getStringExtra("id"); + mCompanyId = getIntent().getStringExtra("cId"); + String name = getIntent().getStringExtra("name"); + String peo = getIntent().getStringExtra("peo"); + mTvName.setText(name); + mTvPeo.setText(peo); + mOptions = new ArrayList<>(); + mAdapter = new NewOptionsAdapter(this, mOptions); + mRlvOptions.setAdapter(mAdapter); + mLlStateDis.setVisibility(View.GONE); + LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false) { + @Override + public boolean canScrollVertically() { + return true; + } + }; + mRlvOptions.setLayoutManager(linearLayoutManager); + mAdapter.setStateChangeListener(isCheck -> { + if (isCheck) { + //存在检查不合格项 + mLlStateDis.setVisibility(View.VISIBLE); + } else { + //不存在 + mLlStateDis.setVisibility(View.GONE); + } + }); + + getCheckOptions(id, nId); + + mNowStrings = mActivity.getResources().getStringArray(R.array.limit); + mTermStrings = mActivity.getResources().getStringArray(R.array.timeLimit); + mBtnUnclaim.setOnClickListener(v -> doUnclaim()); + mTermAdapter = new ArrayAdapter<>(mActivity, R.layout.item_pop_text, mTermStrings); + mNowAdapter = new ArrayAdapter<>(mActivity, R.layout.item_pop_text, mNowStrings); + mSpTerm.setAdapter(mNowAdapter); + mSpTerm.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int i, long l) { + mSelType = mNowStrings[i]; + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + mRgTerm.setOnCheckedChangeListener((radioGroup, i) -> { + switch (i) { + case R.id.rb_now: + //立即整改 + mSpTerm.setVisibility(View.VISIBLE); + mSpTerm.setAdapter(mNowAdapter); + mSpTerm.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int i, long l) { + mSelType = mNowStrings[i]; + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + mType = 1; + break; + case R.id.rb_coor: + //不配合 + mSpTerm.setVisibility(View.GONE); + mType = 3; + break; + case R.id.rb_term: + //限期整改 + mType = 2; + mSpTerm.setVisibility(View.VISIBLE); + mSpTerm.setAdapter(mTermAdapter); + mSpTerm.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int i, long l) { + mSelType = mTermStrings[i]; + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + break; + } + }); + mPhotos = new ArrayList<>(); + mPhotos.add(new AddPhotoBean()); + mAddPhotoAdapter = new AddPhotoAdapter(this, mPhotos); + mRlvPhotos.setLayoutManager(new GridLayoutManager(mActivity, 4)); + mRlvPhotos.setAdapter(mAddPhotoAdapter); + //删除上传的相片 + mAddPhotoAdapter.addOnDeleteListener(((bean, i) -> { + mAddPhotoAdapter.removeItem(bean); + mPhotoIds = mPhotoIds.replace(bean.getId() + ",", ""); + })); + mAddPhotoAdapter.addOnItemClickListener(bean -> { + if (TextUtils.isEmpty(bean.getPath())) { + //空数据 + showSelectPhoto(bean); + } else { + //预览 + ArrayList list = new ArrayList<>(); + list.add(bean.getPath()); + Intent intent = new Intent(); + intent.putExtra(PhotoActivity.TAG_IMGURL, list); + intent.setClass(mActivity, PhotoActivity.class); + startActivity(intent); + } + }); + } + + private void doUnclaim() { + ProgressDialog dialog = new ProgressDialog(mActivity); + dialog.setMessage("上报中..."); + dialog.setCancelable(false); + dialog.setCanceledOnTouchOutside(false); + dialog.show(); + OptionsSubmitBean submitBean = new OptionsSubmitBean(); + submitBean.setEnterpriseId(mCompanyId); + submitBean.setIsCoordination(0); + Gson gson = new Gson(); + String obj = gson.toJson(submitBean); + RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj); + RetrofitManager.getInstance() + .create(LocationApiService.class) + .doSaveOptions(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.showShort("检查成功"); + setResult(223); + finish(); + } + + @Override + public void onError(Throwable e) { + ToastUtils.showShort("提交失败,请稍后重试."); + dialog.dismiss(); + } + + @Override + public void onComplete() { + + } + }); + } + + /** + * 构建提交数据 + * + * @param data + */ + private void buildConfirmData(List data) { + mMProgressDialog = new ProgressDialog(mActivity); + mMProgressDialog.setMessage("上报中..."); + mMProgressDialog.setCancelable(false); + mMProgressDialog.setCanceledOnTouchOutside(false); + mMProgressDialog.show(); + + if (checkConfirmParams(data)) { + OptionsSubmitBean submitBean = new OptionsSubmitBean(); + submitBean.setEnterpriseId(mCompanyId); + submitBean.setCheckType(1); + submitBean.setIsCoordination(1); + List items = new ArrayList<>(); + for (int i = 0; i < data.size(); i++) { + NewOptions o = data.get(i); + List child = data.get(i).getChild(); + for (int j = 0; j < child.size(); j++) { + if (child.get(j).getType() == 1) { + //选择 + if (child.get(j).isCheck()) { + OptionsSubmitBean.HiddenDangerReportsBean bean = new OptionsSubmitBean.HiddenDangerReportsBean(); + bean.setCheckItemId(o.getId()); + bean.setCheckItemOptionId(child.get(j).getItemId()); + bean.setCheckResult(child.get(j).getItemId()); + bean.setType(child.get(j).getType()); + items.add(bean); + } + } else { + //输入 + OptionsSubmitBean.HiddenDangerReportsBean bean = new OptionsSubmitBean.HiddenDangerReportsBean(); + bean.setCheckItemId(o.getId()); + bean.setCheckItemOptionId(child.get(j).getItemId()); + bean.setType(child.get(j).getType()); + if (TextUtils.isEmpty(child.get(j).getInputText())) { + bean.setCheckResult(""); + } else { + bean.setCheckResult(child.get(j).getInputText()); + } + items.add(bean); + } + } + } + + + if (mType == 1) { + submitBean.setRectificationType(1); + //立即整改 + if (mSelType.equals("当场整改")) { + submitBean.setImmediatelyChangeType(1); + } else { + submitBean.setImmediatelyChangeType(2); + } + } else { + submitBean.setRectificationType(2); + String strDay = mSelType.substring(0, mSelType.lastIndexOf("天")); + submitBean.setRectificationDays(Integer.parseInt(strDay)); + } + if (!TextUtils.isEmpty(mPhotoIds)) { + submitBean.setScenePhotos(mPhotoIds); + } + submitBean.setHiddenDangerReports(items); + submitBean.setCheckLat(mCurrentLatitude + ""); + submitBean.setCheckLng(mCurrentLongitude + ""); + doSubmit(submitBean); + } else { + mMProgressDialog.dismiss(); + ToastUtils.showShort("检查项中存在未检查的项目"); + } + } + + /** + * 校验参数是否合法 + * + * @return + */ + private boolean checkConfirmParams(List data) { + boolean isComplete = true; + for (int i = 0; i < data.size(); i++) { + if (data.get(i).getState() == EmStateCheck.NORMAL) { + isComplete = false; + break; + } + } + return isComplete; + } + + /** + * 提交检查结果 + * + * @param submitBean + */ + private void doSubmit(OptionsSubmitBean submitBean) { + Gson gson = new Gson(); + String obj = gson.toJson(submitBean); + RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj); + RetrofitManager.getInstance() + .create(LocationApiService.class) + .doSaveOptions(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(SuccessBean successBean) { + mMProgressDialog.dismiss(); + ToastUtils.showShort("检查成功"); + setResult(223); + finish(); + } + + @Override + public void onError(Throwable e) { + ToastUtils.showShort("提交失败,请稍后重试."); + mMProgressDialog.dismiss(); + } + + @Override + public void onComplete() { + + } + }); + } + + private void getCheckOptions(String id, String nId) { + refreshView(STATE_LOAD_LOADING); + RetrofitManager.getInstance() + .create(LocationApiService.class) + .getCheckOptionsList(id, nId, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(List checkOptionsbeans) { + if (checkOptionsbeans != null && checkOptionsbeans.size() > 0) { + buildCheckOptions(checkOptionsbeans); + } else { + refreshView(STATE_LOAD_EMPTY); + } + } + + @Override + public void onError(Throwable e) { + refreshView(STATE_LOAD_ERROR); + } + + @Override + public void onComplete() { + + } + }); + } + + + private void buildCheckOptions(List checkOptionsbeans) { + for (int i = 0; i < checkOptionsbeans.size(); i++) { + List mPhotos = new ArrayList<>(); + mPhotos.add(new AddPhotoBean()); + NewOptions o = new NewOptions(); + List beans = new ArrayList<>(); + for (int j = 0; j < checkOptionsbeans.get(i).getCheckItemOptions().size(); j++) { + NewOptions.ChildBean bean = new NewOptions.ChildBean(); + CheckOptionsbean.CheckItemOptionsBean optionsBean = checkOptionsbeans.get(i).getCheckItemOptions().get(j); + bean.setId(j); + bean.setItemId(optionsBean.getCheckItemOptionId()); + bean.setTitle(optionsBean.getName()); + bean.setType(optionsBean.getType()); + if (checkOptionsbeans.get(i).getCheckItemOptions().get(j).getIsWrong() == 0) { + bean.setWrong(false); + } else { + bean.setWrong(true); + } + bean.setCheck(false); + beans.add(bean); + } + o.setType(checkOptionsbeans.get(i).getType()); + o.setChild(beans); + o.setId(checkOptionsbeans.get(i).getCheckItemId()); + o.setTitle(checkOptionsbeans.get(i).getNameJoinByCheckItemId()); + o.setPhotos(mPhotos); + o.setIsMust(checkOptionsbeans.get(i).getType()); + mOptions.add(o); + } + mAdapter.setData(mOptions); + refreshView(STATE_LOAD_SUCCESS); + } + + /** + * 显示选择图片 + * + * @param bean + */ + private void showSelectPhoto(AddPhotoBean bean) { + hideSoftKeyboard(); + ButtomDialogView buttomDialogView = new ButtomDialogView.DialogBuilder(mActivity) + .setIsBackCancelable(true) + .setIscancelable(true) + .setShowLocation(Gravity.BOTTOM) + .setIsShowFile(false) + .build(); + buttomDialogView.addOnChoseListener(new ButtomDialogView.OnChoseListener() { + @Override + public void choseFile() { + } + + @Override + public void choseAlbum() { + mCurrentBean = bean; + Intent intent = new Intent(Intent.ACTION_PICK, null); + intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, + "image/*"); + startActivityForResult(intent, BaseUrlApi.PHOTO_REQUEST); + buttomDialogView.dismiss(); + } + + @Override + public void choseShoot() { + mCurrentBean = bean; + mPicPath = PathConfig.CATCH_PATH + System.currentTimeMillis() + ".jpg"; + File file = new File(mPicPath); + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + // 下面这句指定调用相机拍照后的照片存储的路径 + Uri uri; + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) { + uri = Uri.fromFile(file); + } else { + uri = FileProvider.getUriForFile(mActivity, ProiderUtil.getFileProviderName(mActivity), file); + } + intent.putExtra(MediaStore.EXTRA_OUTPUT, uri); + startActivityForResult(intent, BaseUrlApi.CAMERA_REQUEST); + } + + @Override + public void loginOut() { + + } + + @Override + public void changePwd() { + + } + }); + buttomDialogView.show(); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (resultCode == RESULT_OK) { + switch (requestCode) { + case BaseUrlApi.CAMERA_REQUEST://相机 + uploadImg(mPicPath, 1); + break; + case BaseUrlApi.PHOTO_REQUEST://相册 + try { + if (data == null) return; + Uri uri = data.getData(); + String[] proj = {MediaStore.Images.Media.DATA}; + Cursor cursor = managedQuery(uri, proj, null, null, null); + int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA); + cursor.moveToFirst(); + String srcPath = cursor.getString(column_index); + uploadImg(srcPath, 2); + } catch (Exception e) { + e.printStackTrace(); + } + break; + } + } + super.onActivityResult(requestCode, resultCode, data); + } + + /** + * 上传文件 + * + * @param picPath + */ + private void uploadImg(String picPath, int src) { + File file = new File(picPath); + if (!file.exists()) { + showToast("图片路径错误."); + return; + } + ProgressDialog progressDialog = UIUtil.initDialog(mActivity, "正在上传..."); + progressDialog.show(); + Luban.with(mActivity) + .load(picPath) + .ignoreBy(100) + .setTargetDir(PathConfig.CATCH_PATH) + .filter(path -> !(TextUtils.isEmpty(path) || path.toLowerCase().endsWith(".gif"))) + .setCompressListener(new OnCompressListener() { + @Override + public void onStart() { + + } + + @Override + public void onSuccess(File file) { + RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file); + MultipartBody.Part body = MultipartBody.Part.createFormData("image", file.getName(), requestFile); + RetrofitManager.getInstance() + .create(LocationApiService.class) + .uploadImage(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(BaseUserBean baseUserBean) { + if (progressDialog != null && progressDialog.isShowing()) { + progressDialog.dismiss(); + } + ToastUtils.showShort("上传成功"); + mCurrentBean.setId(baseUserBean.getData()); + mPhotoIds += baseUserBean.getData() + ","; + mCurrentBean.setPath(picPath); + if (mPhotos.size() < 9) { + mPhotos.add(new AddPhotoBean()); + } + mAddPhotoAdapter.notifyDataSetChanged(); + mCurrentBean = null; + } + + @Override + public void onError(Throwable e) { + if (progressDialog != null && progressDialog.isShowing()) { + progressDialog.dismiss(); + } + ToastUtils.showShort("上传失败,请稍后重试."); + if (file.exists()) { + file.delete(); + } + } + + @Override + public void onComplete() { + + } + }); + } + + @Override + public void onError(Throwable e) { + if (progressDialog.isShowing()) { + progressDialog.dismiss(); + } + ToastUtils.showShort("图片上传失败,请稍后重试"); + } + }) + .launch(); + } + + /** + * 初始化定位参数配置 + */ + + private void startListenerLocation() { + mLocationClient = new LocationClient(getApplicationContext()); + LocationClientOption locationOption = new LocationClientOption(); + MyLocationListener myLocationListener = new MyLocationListener(); + mLocationClient.registerLocationListener(myLocationListener); + locationOption.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy); + locationOption.setCoorType("bd09ll"); + locationOption.setScanSpan(1000); + locationOption.setIsNeedAddress(true); + locationOption.setIsNeedLocationDescribe(true); + locationOption.setNeedDeviceDirect(false); + locationOption.setLocationNotify(true); + locationOption.setIgnoreKillProcess(true); + locationOption.setIsNeedLocationDescribe(true); + locationOption.setIsNeedLocationPoiList(true); + locationOption.SetIgnoreCacheException(false); + locationOption.setOpenGps(true); + locationOption.setIsNeedAltitude(false); + locationOption.setOpenAutoNotifyMode(); + locationOption.setLocationPurpose(LocationClientOption.BDLocationPurpose.SignIn); + locationOption.setOpenAutoNotifyMode(3000, 1, LocationClientOption.LOC_SENSITIVITY_HIGHT); + mLocationClient.setLocOption(locationOption); + mLocationClient.start(); + } + + /** + * 实现定位回调 + */ + public class MyLocationListener extends BDAbstractLocationListener { + @Override + public void onReceiveLocation(BDLocation location) { + double latitude = location.getLatitude(); + double longitude = location.getLongitude(); + float radius = location.getRadius(); + int errorCode = location.getLocType(); + if (latitude != Double.MIN_VALUE && longitude != Double.MIN_VALUE && radius <= 300) { + LogUtils.e("===="); + mCurrentLatitude = latitude; + mCurrentLongitude = longitude; + mLocationClient.stop(); + } + } + } +} diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/demo/NewOptions.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/demo/NewOptions.java new file mode 100644 index 0000000..789ce80 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/demo/NewOptions.java @@ -0,0 +1,188 @@ +package com.sucstepsoft.txrealtimelocation.activitys.issue.demo; + +import com.sucstepsoft.cm_utils.core.beans.AddPhotoBean; +import com.sucstepsoft.txrealtimelocation.widget.EmStateCheck; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2020/3/27 - 10:30 AM + * 邮箱: itgaojian@163.com + * 描述: + */ +public class NewOptions { + private int type;// 1单选 2输入 + private String id; + private List photos; + private List child; + private String title; + private EmStateCheck state = EmStateCheck.NORMAL;//检查状态 normal未检查 check合格 uncheck不合格 + private int rectify = 4;//立即整改-4,限期整改-5 不配合-6 + private int isMust = 1;//1 必查 2选查 + private String inputContent; + + //整改期限 + // 当场整改 + // 当天整改 + //限期整改 + // 1天 5 10 + + public List getChild() { + return child; + } + + public void setChild(List child) { + this.child = child; + } + + public String getInputContent() { + return inputContent; + } + + public void setInputContent(String inputContent) { + this.inputContent = inputContent; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + private String timeLimit; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTimeLimit() { + return timeLimit; + } + + public void setTimeLimit(String timeLimit) { + this.timeLimit = timeLimit; + } + + public int getRectify() { + return rectify; + } + + public void setRectify(int rectify) { + this.rectify = rectify; + } + + public List getPhotos() { + return photos; + } + + public void setPhotos(List photos) { + this.photos = photos; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + + public EmStateCheck getState() { + return state; + } + + public void setState(EmStateCheck state) { + this.state = state; + } + + public int getIsMust() { + return isMust; + } + + public void setIsMust(int isMust) { + this.isMust = isMust; + } + + public static class ChildBean { + private int id; + private String title; + private boolean isCheck; + private boolean isWrong; + private String itemId; + private int type; + private String inputNumber; + private String inputText; + + public String getInputNumber() { + return inputNumber; + } + + public void setInputNumber(String inputNumber) { + this.inputNumber = inputNumber; + } + + public String getInputText() { + return inputText; + } + + public void setInputText(String inputText) { + this.inputText = inputText; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public String getItemId() { + return itemId; + } + + public void setItemId(String itemId) { + this.itemId = itemId; + } + + public boolean isWrong() { + return isWrong; + } + + public void setWrong(boolean wrong) { + isWrong = wrong; + } + + public boolean isCheck() { + return isCheck; + } + + public void setCheck(boolean check) { + isCheck = check; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + } +} diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/demo/NewOptionsAdapter.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/demo/NewOptionsAdapter.java new file mode 100644 index 0000000..4041d45 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/demo/NewOptionsAdapter.java @@ -0,0 +1,205 @@ +package com.sucstepsoft.txrealtimelocation.activitys.issue.demo; + +import android.content.Context; +import android.support.v7.widget.GridLayoutManager; +import android.text.Editable; +import android.text.InputType; +import android.text.TextUtils; +import android.text.TextWatcher; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.EditText; +import android.widget.LinearLayout; +import android.widget.RadioButton; +import android.widget.RadioGroup; + +import com.sucstepsoft.cm_utils.core.beans.AddPhotoBean; +import com.sucstepsoft.cm_utils.core.widget.base.AddPhotoAdapter; +import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter; +import com.sucstepsoft.cm_utils.utils.ConvertUtils; +import com.sucstepsoft.cm_utils.utils.LogUtils; +import com.sucstepsoft.cm_utils.utils.ScreenUtils; +import com.sucstepsoft.txrealtimelocation.R; +import com.sucstepsoft.txrealtimelocation.widget.EmStateCheck; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2020/3/27 - 10:30 AM + * 邮箱: itgaojian@163.com + * 描述: + */ +public class NewOptionsAdapter extends BaseRecyclerAdapter { + + private int dp2px; + private int dp2px10; + private int sp2px; + + public NewOptionsAdapter(Context ctx, List list) { + super(ctx, list); + dp2px = ConvertUtils.dp2px(5); + dp2px10 = ConvertUtils.dp2px(8); + sp2px = 15; + } + + @Override + public NewOptionsHolder createHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(mContext).inflate(R.layout.item_options_new, parent, false); + return new NewOptionsHolder(view); + } + + + @Override + public void bindHolder(NewOptionsHolder oHolder, int i) { + //设置是否必须星号 + if (mData.get(i).getIsMust() == 1) { + oHolder.mIvIsMust.setVisibility(View.INVISIBLE); + } else { + oHolder.mIvIsMust.setVisibility(View.INVISIBLE); + } + oHolder.mTvTitle.setText(mData.get(i).getTitle()); + oHolder.mRgState.setOnCheckedChangeListener(null); + oHolder.mEtContent.setVisibility(View.GONE); + boolean isInput = false; + + for (int j = 0; j < mData.get(i).getChild().size(); j++) { + if (mData.get(i).getChild().get(j).getType() == 1) { + NewOptions.ChildBean bean = mData.get(i).getChild().get(j); + RadioButton button = new RadioButton(mContext); + button.setId(bean.getId()); + button.setText(bean.getTitle()); + button.setPadding(dp2px, dp2px, dp2px, dp2px); + button.setTextSize(sp2px); + button.setButtonDrawable(R.drawable.sel_rb); + oHolder.mRgState.addView(button); + isInput = true; + } else { + EditText editText = new EditText(mContext); + editText.setHint("请输入" + mData.get(i).getTitle() + mData.get(i).getChild().get(j).getTitle()); + editText.setBackgroundResource(R.drawable.sp_square_btn_gray_sel); + editText.setPadding(dp2px, dp2px, dp2px, dp2px); + editText.setTextSize(sp2px); + LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); + lp.bottomMargin = dp2px10; + lp.leftMargin = dp2px10; + lp.rightMargin = dp2px10; + lp.topMargin = dp2px10; + editText.setLayoutParams(lp); + if (mData.get(i).getChild().get(j).getType() == 2) { + editText.setInputType(InputType.TYPE_CLASS_NUMBER); + } else { + editText.setInputType(InputType.TYPE_CLASS_TEXT); + } + int finalJ = j; + editText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i2, int i3, int i4) { + mData.get(i).getChild().get(finalJ).setInputText(charSequence.toString().trim()); +// boolean isInput = false; +// for (int k = 0; k < mData.get(i).getChild().size(); k++) { +// if (mData.get(i).getChild().get(k).getType() == 1) { +// isInput = true; +// break; +// } +// } +// //纯输入 +// if (!isInput) { +// //纯输入 判断有没有值 +// boolean input = false; +// +// for (int k = 0; k < mData.get(i).getChild().size(); k++) { +// if (!TextUtils.isEmpty(mData.get(i).getChild().get(k).getInputText())) { +// //有值 +// input = true; +// break; +// } +// } +// if (input) { +// mData.get(i).setState(EmStateCheck.CHECK); +// } else { +// mData.get(i).setState(EmStateCheck.UNCHECK); +// } +// } + } + + @Override + public void afterTextChanged(Editable editable) { + + } + }); + oHolder.mLlCheck.addView(editText); + } + } + oHolder.mRgState.setOnCheckedChangeListener((radioGroup, i1) -> { + for (int j = 0; j < mData.get(i).getChild().size(); j++) { + if (mData.get(i).getChild().get(j).getId() == i1) { + mData.get(i).getChild().get(j).setCheck(true); + //纯选择 + if (mData.get(i).getChild().get(j).getType() == 1) { + if (mData.get(i).getChild().get(j).isWrong()) { + mData.get(i).setState(EmStateCheck.UNCHECK); + } else { + mData.get(i).setState(EmStateCheck.CHECK); + } + } + } else { + mData.get(i).getChild().get(j).setCheck(false); + } + } + notifyDataChange(); + }); + if (isInput) { + //存在选择 + mData.get(i).setState(EmStateCheck.NORMAL); + } else { + mData.get(i).setState(EmStateCheck.CHECK); + } + } + + + private void notifyDataChange() { + boolean isUnCheck = false; + for (int i = 0; i < mData.size(); i++) { + for (int j = 0; j < mData.get(i).getChild().size(); j++) { + NewOptions.ChildBean bean = mData.get(i).getChild().get(j); + if (bean.isCheck() && bean.isWrong() && mData.get(i).getIsMust() == 1) { + isUnCheck = true; + break; + } + } + } + mChangeListener.onStateChange(isUnCheck); + } + + + private SelectPhoto mSelectPhotoListener; + + public void addSelectPhotoListener(SelectPhoto selectPhotoListener) { + this.mSelectPhotoListener = selectPhotoListener; + } + + public interface SelectPhoto { + void onSelectPhoto(AddPhotoBean bean, Options options, int i, int type); + } + + private StateChangeListener mChangeListener; + + public void setStateChangeListener(StateChangeListener listener) { + this.mChangeListener = listener; + } + + public interface StateChangeListener { + void onStateChange(boolean isCheck); + } + +} diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/demo/NewOptionsHolder.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/demo/NewOptionsHolder.java new file mode 100644 index 0000000..dd06d46 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/demo/NewOptionsHolder.java @@ -0,0 +1,37 @@ +package com.sucstepsoft.txrealtimelocation.activitys.issue.demo; + +import android.support.annotation.NonNull; +import android.support.v7.widget.AppCompatSpinner; +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.EditText; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.RadioButton; +import android.widget.RadioGroup; +import android.widget.TextView; + +import com.sucstepsoft.txrealtimelocation.R; + +/** + * 作者: adam + * 日期: 2020/3/27 - 10:32 AM + * 邮箱: itgaojian@163.com + * 描述: + */ +public class NewOptionsHolder extends RecyclerView.ViewHolder { + public TextView mTvTitle; + public ImageView mIvIsMust; + public RadioGroup mRgState; + public LinearLayout mLlCheck; + public EditText mEtContent; + + public NewOptionsHolder(@NonNull View itemView) { + super(itemView); + mTvTitle = itemView.findViewById(R.id.tv_title); + mRgState = itemView.findViewById(R.id.rg_state); + mIvIsMust = itemView.findViewById(R.id.iv_must); + mLlCheck = itemView.findViewById(R.id.ll_check); + mEtContent = itemView.findViewById(R.id.et_content); + } +} diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/trouble/SelCompanyActivity.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/trouble/SelCompanyActivity.java index d9fc354..4353a1f 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/trouble/SelCompanyActivity.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/trouble/SelCompanyActivity.java @@ -26,6 +26,7 @@ import com.sucstepsoft.cm_utils.utils.UIUtil; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.sucstepsoft.txrealtimelocation.R; import com.sucstepsoft.txrealtimelocation.activitys.issue.CheckOptionsActivity; +import com.sucstepsoft.txrealtimelocation.activitys.issue.NewCheckOptionsActivity; import com.sucstepsoft.txrealtimelocation.adapters.CompanyCheckAdapter; import com.sucstepsoft.txrealtimelocation.beans.CompanyListDataBean; import com.sucstepsoft.txrealtimelocation.beans.DictBean; @@ -119,12 +120,13 @@ public class SelCompanyActivity extends BaseActivity { mAdapter = new CompanyCheckAdapter(mActivity, mDatas); mXlvComLib.setAdapter(mAdapter); mAdapter.addOnItemClickListener(bean -> { - Intent intent = new Intent(mActivity, CheckOptionsActivity.class); + Intent intent = new Intent(mActivity, NewCheckOptionsActivity.class); + intent.putExtra("nId", bean.getNatureJoinByEnterpriseId()); intent.putExtra("id", bean.getIndustryJoinByEnterpriseId()); - intent.putExtra("cId",bean.getEnterpriseId()); + intent.putExtra("cId", bean.getEnterpriseId()); intent.putExtra("name", bean.getNameJoinByEnterpriseId()); intent.putExtra("peo", bean.getMasterJoinByEnterpriseId()); - intent.putExtra("phone",bean.getPhoneJoinByEnterpriseId()); + intent.putExtra("phone", bean.getPhoneJoinByEnterpriseId()); startActivity(intent); }); LinearLayoutManager layoutManager = new LinearLayoutManager(mActivity); diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/CompanyLibAdapter.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/CompanyLibAdapter.java index 51875d2..b75f4f9 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/CompanyLibAdapter.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/CompanyLibAdapter.java @@ -35,7 +35,7 @@ public class CompanyLibAdapter extends BaseRecyclerAdapter { - private ArrayAdapter mDefaultApater; - private ArrayAdapter mAdapter; - private String[] mNowStrings; - private String[] mTermStrings; +public class CounterCheckOptionsAdapter extends BaseRecyclerAdapter { public CounterCheckOptionsAdapter(Context ctx, List list) { super(ctx, list); - mNowStrings = mContext.getResources().getStringArray(R.array.limit); - mTermStrings = mContext.getResources().getStringArray(R.array.timeLimit); } @Override @@ -52,235 +54,107 @@ public class CounterCheckOptionsAdapter extends BaseRecyclerAdapter { - LogUtils.e("调用了==" + i1); - switch (i1) { - case R.id.rb_state_uncheck: - mData.get(i).setState(EmStateCheck.NORMAL); - oHolder.mLlContent.setVisibility(View.GONE); - oHolder.mRlvPhotos.setVisibility(View.GONE); - setNomarlData(oHolder, mData.get(i), i); - break; - case R.id.rb_state_check: - mData.get(i).setState(EmStateCheck.CHECK); - oHolder.mLlContent.setVisibility(View.GONE); - oHolder.mRlvPhotos.setVisibility(View.VISIBLE); - setCheckData(oHolder, mData.get(i), i); - break; - case R.id.rb_state_dis: - mData.get(i).setState(EmStateCheck.UNCHECK); - oHolder.mLlContent.setVisibility(View.VISIBLE); - oHolder.mRlvPhotos.setVisibility(View.VISIBLE); - setDisData(oHolder, mData.get(i), i); - break; - } - }); - setPhotoView(mData.get(i), oHolder, i); - } - - /** - * 设置不合格数据 - * - * @param oHolder - * @param op - * @param index - */ - private void setDisData(CounterCheckOptionHolder oHolder, Options op, int index) { - oHolder.mRgState.check(R.id.rb_state_dis); - mData.get(index).setState(EmStateCheck.UNCHECK); - //TODO 不合格 回显 - int rectify = mData.get(index).getRectify(); - if (rectify == 4) {//立即整改 - oHolder.mRg.check(R.id.rb_now); - oHolder.mLlSp.setVisibility(View.VISIBLE); - String timeLimit = mData.get(index).getTimeLimit(); - mDefaultApater = new ArrayAdapter<>(mContext, R.layout.item_pop_text, mNowStrings); - oHolder.mSpinner.setAdapter(mDefaultApater); - if (!TextUtils.isEmpty(timeLimit)) { - //之前选择过 - if (timeLimit.equals("立即整改")) { - oHolder.mSpinner.setSelection(0); + for (int j = 0; j < mData.get(i).getChild().size(); j++) { + if (mData.get(i).getChild().get(j).getId() == i1) { + mData.get(i).getChild().get(j).setCheck(true); + //纯选择 + if (mData.get(i).getChild().get(j).getType() == 1) { + if (mData.get(i).getChild().get(j).isWrong()) { + mData.get(i).setState(EmStateCheck.UNCHECK); + } else { + mData.get(i).setState(EmStateCheck.CHECK); + } + } } else { - oHolder.mSpinner.setSelection(1); + mData.get(i).getChild().get(j).setCheck(false); } - } else { - //未选择过 - oHolder.mSpinner.setSelection(0); } - oHolder.mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { - @Override - public void onItemSelected(AdapterView adapterView, View view, int i, long l) { - String s = mNowStrings[i]; - mData.get(index).setTimeLimit(s); - } - - @Override - public void onNothingSelected(AdapterView adapterView) { - - } - }); - } else if (rectify == 5) {//限期整改 - oHolder.mRg.check(R.id.rb_term); - oHolder.mLlSp.setVisibility(View.VISIBLE); - String timeLimit = mData.get(index).getTimeLimit(); - mAdapter = new ArrayAdapter<>(mContext, R.layout.item_pop_text, mTermStrings); - oHolder.mSpinner.setAdapter(mAdapter); - if (!TextUtils.isEmpty(timeLimit)) { - //之前选择过 - switch (timeLimit) { - case "5天": - oHolder.mSpinner.setSelection(1); - break; - case "10天": - oHolder.mSpinner.setSelection(2); - break; - case "15天": - oHolder.mSpinner.setSelection(3); - break; - case "20天": - oHolder.mSpinner.setSelection(4); - break; - case "25天": - oHolder.mSpinner.setSelection(5); - break; - case "30天": - oHolder.mSpinner.setSelection(6); - break; - case "1天": - default: - oHolder.mSpinner.setSelection(0); - break; - } - } else { - //未选择过 - oHolder.mSpinner.setSelection(0); - } - oHolder.mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { - @Override - public void onItemSelected(AdapterView adapterView, View view, int i, long l) { - String s = mTermStrings[i]; - mData.get(index).setTimeLimit(s); - } - - @Override - public void onNothingSelected(AdapterView adapterView) { - - } - }); - } else {//不配合 - oHolder.mRg.check(R.id.rb_coor); - oHolder.mLlSp.setVisibility(View.GONE); + notifyDataChange(); + }); + if (isInput) { + //存在选择 + mData.get(i).setState(EmStateCheck.NORMAL); + } else { + mData.get(i).setState(EmStateCheck.CHECK); } - oHolder.mRg.setOnCheckedChangeListener((radioGroup, id) -> { - if (id == R.id.rb_now) { //立即整改 - oHolder.mLlSp.setVisibility(View.VISIBLE); - mDefaultApater = new ArrayAdapter<>(mContext, R.layout.item_pop_text, mNowStrings); - oHolder.mSpinner.setAdapter(mDefaultApater); - oHolder.mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { - @Override - public void onItemSelected(AdapterView adapterView, View view, int i, long l) { - String s = mNowStrings[i]; - mData.get(index).setTimeLimit(s); - } - - @Override - public void onNothingSelected(AdapterView adapterView) { - - } - }); - mData.get(index).setRectify(4); - mData.get(index).setTimeLimit("立即整改"); - } else if (id == R.id.rb_term) { //限期整改 - oHolder.mLlSp.setVisibility(View.VISIBLE); - mAdapter = new ArrayAdapter<>(mContext, R.layout.item_pop_text, mTermStrings); - oHolder.mSpinner.setAdapter(mAdapter); - oHolder.mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { - @Override - public void onItemSelected(AdapterView adapterView, View view, int i, long l) { - String s = mTermStrings[i]; - mData.get(index).setTimeLimit(s); - } - - @Override - public void onNothingSelected(AdapterView adapterView) { - - } - }); - mData.get(index).setRectify(5); - mData.get(index).setTimeLimit("1天"); - } else { //不配合 - oHolder.mLlSp.setVisibility(View.GONE); - mData.get(index).setRectify(6); - } - }); } - /** - * 设置合格数据 - * - * @param oHolder - * @param op - * @param index - */ - private void setCheckData(CounterCheckOptionHolder oHolder, Options op, int index) { - oHolder.mRgState.check(R.id.rb_state_check); - setPhotoView(op, oHolder, index); - mData.get(index).setState(EmStateCheck.CHECK); - mData.get(index).setRectify(4); - mData.get(index).setTimeLimit(""); - } - - /** - * 设置未检查数据 - * - * @param oHolder - * @param op - * @param index - */ - private void setNomarlData(CounterCheckOptionHolder oHolder, Options op, int index) { - oHolder.mRgState.check(R.id.rb_state_uncheck); - mData.get(index).setState(EmStateCheck.NORMAL); - setPhotoView(op, oHolder, index); - mData.get(index).setRectify(4); - mData.get(index).setTimeLimit(""); - } - - - private void setPhotoView(Options op, CounterCheckOptionHolder oHolder, int index) { - AddPhotoAdapter photoAdapter = new AddPhotoAdapter(mContext, mData.get(index).getPhotos()); - oHolder.mRlvPhotos.setAdapter(photoAdapter); - oHolder.mRlvPhotos.setLayoutManager(new GridLayoutManager(mContext, 4)); - photoAdapter.addOnItemClickListener(bean -> { - if (mSelectPhotoListener != null) { - if (TextUtils.isEmpty(bean.getPath())) { - //空数据,选择图片 - mSelectPhotoListener.onSelectPhoto(bean, mData.get(index), index, 1); - } else { - mSelectPhotoListener.onSelectPhoto(bean, mData.get(index), index, 2); + private void notifyDataChange() { + boolean isUnCheck = false; + for (int i = 0; i < mData.size(); i++) { + for (int j = 0; j < mData.get(i).getChild().size(); j++) { + NewOptions.ChildBean bean = mData.get(i).getChild().get(j); + if (bean.isCheck() && bean.isWrong() && mData.get(i).getIsMust() == 1) { + isUnCheck = true; + break; } } - }); + } + mChangeListener.onStateChange(isUnCheck); + } + private StateChangeListener mChangeListener; + + public void setStateChangeListener(StateChangeListener listener) { + this.mChangeListener = listener; + } + + public interface StateChangeListener { + void onStateChange(boolean isCheck); } private OptionsAdapter.SelectPhoto mSelectPhotoListener; diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/MissionDetailAdapter.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/MissionDetailAdapter.java index f443721..2524f5f 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/MissionDetailAdapter.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/MissionDetailAdapter.java @@ -8,6 +8,7 @@ import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter; @@ -15,6 +16,7 @@ import com.sucstepsoft.cm_utils.core.widget.base.BaseShowPhotoAdapter; import com.sucstepsoft.txrealtimelocation.R; import com.sucstepsoft.txrealtimelocation.activitys.common.PhotoActivity; import com.sucstepsoft.txrealtimelocation.adapters.holders.MissionDetailHolder; +import com.sucstepsoft.txrealtimelocation.beans.HistoryDetialBean; import com.sucstepsoft.txrealtimelocation.beans.HistoryMissionBean; import java.util.ArrayList; @@ -26,9 +28,8 @@ import java.util.List; * 邮箱: itgaojian@163.com * 描述: */ -public class MissionDetailAdapter extends BaseRecyclerAdapter { - - public MissionDetailAdapter(Context ctx, List list) { +public class MissionDetailAdapter extends BaseRecyclerAdapter { + public MissionDetailAdapter(Context ctx, List list) { super(ctx, list); } @@ -40,61 +41,26 @@ public class MissionDetailAdapter extends BaseRecyclerAdapter photos = new ArrayList<>(); - String[] split = mData.get(i).getScenePhotos().split(","); - for (int j = 0; j < split.length; j++) { - if (!TextUtils.isEmpty(split[j])) { - photos.add(BaseUrlApi.BASE_IMG_URL + split[j]); + holder.mTvName.setText(mData.get(i).getName()); + if (mData.get(i).getHiddenDangerReports() != null && mData.get(i).getHiddenDangerReports().size() > 0) { + holder.mLlContent.setVisibility(View.VISIBLE); + for (int j = 0; j < mData.get(i).getHiddenDangerReports().size(); j++) { + TextView tv = new TextView(mContext); + tv.setTextSize(13); + switch (mData.get(i).getHiddenDangerReports().get(j).getCheckItemType()) { + case 1: + tv.setText(mData.get(i).getHiddenDangerReports().get(j).getNameJoinByCheckItemId()); + break; + case 2: + case 3: + String tx = mData.get(i).getHiddenDangerReports().get(j).getNameJoinByCheckItemId() + ":" + mData.get(i).getHiddenDangerReports().get(j).getCheckResult() + mData.get(i).getHiddenDangerReports().get(j).getUnitJoinByCheckItemId(); + tv.setText(tx); + break; } + holder.mLlContent.addView(tv); } - BaseShowPhotoAdapter adapter = new BaseShowPhotoAdapter(mContext, photos); - GridLayoutManager manager = new GridLayoutManager(mContext, 4) { - @Override - public boolean canScrollVertically() { - return false; - } - }; - holder.mRlvPhotos.setLayoutManager(manager); - holder.mRlvPhotos.setAdapter(adapter); - adapter.addOnItemClickListener(url -> { - Intent intent = new Intent(mContext, PhotoActivity.class); - intent.putExtra("imgUrls", new ArrayList<>(adapter.getData())); - mContext.startActivity(intent); - }); } else { - holder.mRlvPhotos.setVisibility(View.GONE); + holder.mLlContent.setVisibility(View.GONE); } } } diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/holders/CounterCheckOptionHolder.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/holders/CounterCheckOptionHolder.java index d4ed80d..b20eb62 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/holders/CounterCheckOptionHolder.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/holders/CounterCheckOptionHolder.java @@ -4,6 +4,7 @@ import android.support.annotation.NonNull; import android.support.v7.widget.AppCompatSpinner; import android.support.v7.widget.RecyclerView; import android.view.View; +import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RadioButton; @@ -20,30 +21,20 @@ import com.sucstepsoft.txrealtimelocation.widget.StateCheckView; * 描述: 复查选项 */ public class CounterCheckOptionHolder extends RecyclerView.ViewHolder { - public TextView mTvTitle; - // public StateCheckView mScvOptions; - public RecyclerView mRlvPhotos; - public LinearLayout mLlContent; - public AppCompatSpinner mSpinner; - public RadioGroup mRg; - public LinearLayout mLlSp; - public RadioButton mRbNow; - public ImageView mIvIsMust; public RadioGroup mRgState; + public TextView mTvTitle; + public ImageView mIvIsMust; + public LinearLayout mLlCheck; + public EditText mEtContent; public CounterCheckOptionHolder(@NonNull View itemView) { super(itemView); mTvTitle = itemView.findViewById(R.id.tv_title); mRgState = itemView.findViewById(R.id.rg_state); -// mScvOptions = itemView.findViewById(R.id.scv_options); - mRlvPhotos = itemView.findViewById(R.id.rlv_photos); - mLlContent = itemView.findViewById(R.id.ll_content); - mSpinner = itemView.findViewById(R.id.sp_term); - mRg = itemView.findViewById(R.id.rg_term); - mRbNow = itemView.findViewById(R.id.rb_now); - mLlSp = itemView.findViewById(R.id.ll_sp); mIvIsMust = itemView.findViewById(R.id.iv_must); + mLlCheck = itemView.findViewById(R.id.ll_check); + mEtContent = itemView.findViewById(R.id.et_content); } } diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/holders/MissionDetailHolder.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/holders/MissionDetailHolder.java index 0b7fb38..631fc5b 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/holders/MissionDetailHolder.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/holders/MissionDetailHolder.java @@ -3,6 +3,7 @@ package com.sucstepsoft.txrealtimelocation.adapters.holders; import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; import android.view.View; +import android.widget.LinearLayout; import android.widget.TextView; import com.sucstepsoft.txrealtimelocation.R; @@ -15,16 +16,11 @@ import com.sucstepsoft.txrealtimelocation.R; */ public class MissionDetailHolder extends RecyclerView.ViewHolder { public TextView mTvName; - public TextView mTvDay; - public TextView mTvCheckType; - public RecyclerView mRlvPhotos; + public LinearLayout mLlContent; public MissionDetailHolder(@NonNull View itemView) { super(itemView); mTvName = itemView.findViewById(R.id.tv_options_name); - mTvDay = itemView.findViewById(R.id.tv_day); - mTvCheckType = itemView.findViewById(R.id.tv_options_check); - mRlvPhotos = itemView.findViewById(R.id.rlv_photos); - + mLlContent = itemView.findViewById(R.id.ll_content); } } diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/base/BaseApplication.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/base/BaseApplication.java index 4bee8b0..2efd9ea 100755 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/base/BaseApplication.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/base/BaseApplication.java @@ -4,6 +4,8 @@ import android.content.Context; import android.support.multidex.MultiDex; import android.support.multidex.MultiDexApplication; +import com.baidu.mapapi.CoordType; +import com.baidu.mapapi.SDKInitializer; import com.squareup.leakcanary.LeakCanary; import com.tencent.bugly.crashreport.CrashReport; @@ -41,16 +43,17 @@ public class BaseApplication extends MultiDexApplication { initJPush(); // CrashReport.initCrashReport(getApplicationContext(), "ff95776367", false); sInitialized = true; + initBaiduMap(); } /** * 百度地图初始化 */ private void initBaiduMap() { -// SDKInitializer.initialize(this); + SDKInitializer.initialize(this); //自4.3.0起，百度地图SDK所有接口均支持百度坐标和国测局坐标，用此方法设置您使用的坐标类型. //包括BD09LL和GCJ02两种坐标，默认是BD09LL坐标。 -// SDKInitializer.setCoordType(CoordType.BD09LL); + SDKInitializer.setCoordType(CoordType.BD09LL); } // public static LocationChangBroadcastReceiver getlocationChangeBoardcase() { diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CheckItemOption.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CheckItemOption.java new file mode 100644 index 0000000..34c92b4 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CheckItemOption.java @@ -0,0 +1,74 @@ +package com.sucstepsoft.txrealtimelocation.beans; + +/** + * 作者: adam + * 日期: 2020/3/31 - 3:57 PM + * 邮箱: itgaojian@163.com + * 描述: + */ +public class CheckItemOption { + + /** + * checkItemId : string + * checkItemOptionId : string + * isWrong : 0 + * name : string + * type : 0 + * unit : string + */ + + private String checkItemId; + private String checkItemOptionId; + private int isWrong; + private String name; + private int type; + private String unit; + + public String getCheckItemId() { + return checkItemId; + } + + public void setCheckItemId(String checkItemId) { + this.checkItemId = checkItemId; + } + + public String getCheckItemOptionId() { + return checkItemOptionId; + } + + public void setCheckItemOptionId(String checkItemOptionId) { + this.checkItemOptionId = checkItemOptionId; + } + + public int getIsWrong() { + return isWrong; + } + + public void setIsWrong(int isWrong) { + this.isWrong = isWrong; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } +} diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CheckOptionsbean.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CheckOptionsbean.java index c46349a..f2fc014 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CheckOptionsbean.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CheckOptionsbean.java @@ -1,5 +1,7 @@ package com.sucstepsoft.txrealtimelocation.beans; +import java.util.List; + /** * 作者: adam * 日期: 2020/3/31 - 3:57 PM @@ -8,32 +10,28 @@ package com.sucstepsoft.txrealtimelocation.beans; */ public class CheckOptionsbean { + /** - * industryCheckItemId : 3a1725c2-c1e6-496b-bb58-f70bbcbc7ded - * industryId : 706b8520-3a1d-431e-a203-0d307dc22e87 - * industryIdDictionaryName : 餐饮 - * checkItemId : a1c27ea5-40dd-4cc8-974c-d387f8ba428c - * nameJoinByCheckItemId : 照明 - * summaryJoinByCheckItemId : 照明 - * typeJoinByCheckItemId : 1 + * industryCheckItemId : a6027f46-8ff0-466a-996b-9198dbfc52c5 + * natureId : 165aa316-2972-4ed9-9a4b-7f8b9d489986 + * natureIdDictionaryName : 商店超市 + * checkItemId : d37491ee-146e-430e-b155-2256fc0c4957 + * nameJoinByCheckItemId : 营业执照 + * summaryJoinByCheckItemId : 营业执照 + * typeJoinByCheckItemId : + * type : 1 + * checkItemOptions : [{"checkItemOptionId":"6ba68e00-4c67-4974-9d8b-5f7e3f2e7027","checkItemId":"","type":1,"name":"有","unit":"","isWrong":0},{"checkItemOptionId":"675a2ead-c22c-4415-94bb-4c8543a4337a","checkItemId":"","type":1,"name":"无","unit":"","isWrong":1}] */ private String industryCheckItemId; - private String industryId; - private String industryIdDictionaryName; + private String natureId; + private String natureIdDictionaryName; private String checkItemId; private String nameJoinByCheckItemId; private String summaryJoinByCheckItemId; private String typeJoinByCheckItemId; private int type; - - public int getType() { - return type; - } - - public void setType(int type) { - this.type = type; - } + private List checkItemOptions; public String getIndustryCheckItemId() { return industryCheckItemId; @@ -43,20 +41,20 @@ public class CheckOptionsbean { this.industryCheckItemId = industryCheckItemId; } - public String getIndustryId() { - return industryId; + public String getNatureId() { + return natureId; } - public void setIndustryId(String industryId) { - this.industryId = industryId; + public void setNatureId(String natureId) { + this.natureId = natureId; } - public String getIndustryIdDictionaryName() { - return industryIdDictionaryName; + public String getNatureIdDictionaryName() { + return natureIdDictionaryName; } - public void setIndustryIdDictionaryName(String industryIdDictionaryName) { - this.industryIdDictionaryName = industryIdDictionaryName; + public void setNatureIdDictionaryName(String natureIdDictionaryName) { + this.natureIdDictionaryName = natureIdDictionaryName; } public String getCheckItemId() { @@ -90,4 +88,86 @@ public class CheckOptionsbean { public void setTypeJoinByCheckItemId(String typeJoinByCheckItemId) { this.typeJoinByCheckItemId = typeJoinByCheckItemId; } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public List getCheckItemOptions() { + return checkItemOptions; + } + + public void setCheckItemOptions(List checkItemOptions) { + this.checkItemOptions = checkItemOptions; + } + + public static class CheckItemOptionsBean { + /** + * checkItemOptionId : 6ba68e00-4c67-4974-9d8b-5f7e3f2e7027 + * checkItemId : + * type : 1 + * name : 有 + * unit : + * isWrong : 0 + */ + + private String checkItemOptionId; + private String checkItemId; + private int type; + private String name; + private String unit; + private int isWrong; + + public String getCheckItemOptionId() { + return checkItemOptionId; + } + + public void setCheckItemOptionId(String checkItemOptionId) { + this.checkItemOptionId = checkItemOptionId; + } + + public String getCheckItemId() { + return checkItemId; + } + + public void setCheckItemId(String checkItemId) { + this.checkItemId = checkItemId; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + + public int getIsWrong() { + return isWrong; + } + + public void setIsWrong(int isWrong) { + this.isWrong = isWrong; + } + } } diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CompanyListDataBean.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CompanyListDataBean.java index f30564a..4fe5e76 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CompanyListDataBean.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CompanyListDataBean.java @@ -46,152 +46,87 @@ public class CompanyListDataBean { public static class RowsBean { + /** - * addressJoinByEnterpriseId : string - * area1DictionaryName : string - * area1JoinByEnterpriseId : string - * area2DictionaryName : string - * area2JoinByEnterpriseId : string - * area3DictionaryName : string - * area3JoinByEnterpriseId : string - * area4DictionaryName : string - * area4JoinByEnterpriseId : string - * area5DictionaryName : string - * area5JoinByEnterpriseId : string - * engagedCountJoinByEnterpriseId : string - * enterpriseId : string - * enterpriseOfGridOperatorId : string - * industryDictionaryName : string - * industryJoinByEnterpriseId : string - * masterJoinByEnterpriseId : string - * nameJoinByEnterpriseId : stringa - * phoneJoinByEnterpriseId : string - * riskOperationDictionaryName : string - * riskOperationJoinByEnterpriseId : string - * typeDictionaryName : string - * typeJoinByEnterpriseId : string - * userId : string + * enterpriseOfGridOperatorId : 8912ae08-fe03-4001-a867-185f8e70946e + * userId : e48e9c4a-995e-4061-abcd-a3c260c11333 + * enterpriseId : b4b4847d-c182-42c2-b699-e412e0fe12c2 + * nameJoinByEnterpriseId : 青山区新达厨卫洁具店 + * typeJoinByEnterpriseId : 30b2b1b8-0915-487f-a33d-449762ed644a + * area1JoinByEnterpriseId : + * area2JoinByEnterpriseId : + * area3JoinByEnterpriseId : + * area4JoinByEnterpriseId : + * area5JoinByEnterpriseId : + * addressJoinByEnterpriseId : 内蒙古自治区包头市青山区色气湾 + * industryJoinByEnterpriseId : 43b477d9-1bc6-4dc9-b5a7-849187bf438e + * engagedCountJoinByEnterpriseId : 2 + * riskOperationJoinByEnterpriseId : + * masterJoinByEnterpriseId : + * phoneJoinByEnterpriseId : + * area1DictionaryName : 内蒙古 + * area2DictionaryName : 包头市 + * area3DictionaryName : 青山区 + * area4DictionaryName : 青福镇 + * area5DictionaryName : 色气湾村 + * industryDictionaryName : + * riskOperationDictionaryName : + * typeDictionaryName : + * industryTypeJoinByEnterpriseId : + * industryTypeDictionaryName : + * legalPerson : + * classifyJoinByEnterpriseId : b61b6396-3ac4-4401-9073-e04f0b33a519 + * classifyDictionaryName : 嘎查村（社区） + * natureJoinByEnterpriseId : 165aa316-2972-4ed9-9a4b-7f8b9d489986 + * natureDictionaryName : 商店超市 */ - private String addressJoinByEnterpriseId; - private String area1DictionaryName; - private String area1JoinByEnterpriseId; - private String area2DictionaryName; - private String area2JoinByEnterpriseId; - private String area3DictionaryName; - private String area3JoinByEnterpriseId; - private String area4DictionaryName; - private String area4JoinByEnterpriseId; - private String area5DictionaryName; - private String area5JoinByEnterpriseId; - private String engagedCountJoinByEnterpriseId; - private String enterpriseId; private String enterpriseOfGridOperatorId; - private String industryDictionaryName; - private String industryJoinByEnterpriseId; - private String masterJoinByEnterpriseId; - private String nameJoinByEnterpriseId; - private String phoneJoinByEnterpriseId; - private String riskOperationDictionaryName; - private String riskOperationJoinByEnterpriseId; - private String typeDictionaryName; - private String typeJoinByEnterpriseId; private String userId; + private String enterpriseId; + private String nameJoinByEnterpriseId; + private String typeJoinByEnterpriseId; + private String area1JoinByEnterpriseId; + private String area2JoinByEnterpriseId; + private String area3JoinByEnterpriseId; + private String area4JoinByEnterpriseId; + private String area5JoinByEnterpriseId; + private String addressJoinByEnterpriseId; + private String industryJoinByEnterpriseId; + private String engagedCountJoinByEnterpriseId; + private String riskOperationJoinByEnterpriseId; + private String masterJoinByEnterpriseId; + private String phoneJoinByEnterpriseId; + private String area1DictionaryName; + private String area2DictionaryName; + private String area3DictionaryName; + private String area4DictionaryName; + private String area5DictionaryName; + private String industryDictionaryName; + private String riskOperationDictionaryName; + private String typeDictionaryName; + private String industryTypeJoinByEnterpriseId; + private String industryTypeDictionaryName; + private String legalPerson; + private String classifyJoinByEnterpriseId; + private String classifyDictionaryName; + private String natureJoinByEnterpriseId; + private String natureDictionaryName; - public String getAddressJoinByEnterpriseId() { - return addressJoinByEnterpriseId; + public String getEnterpriseOfGridOperatorId() { + return enterpriseOfGridOperatorId; } - public void setAddressJoinByEnterpriseId(String addressJoinByEnterpriseId) { - this.addressJoinByEnterpriseId = addressJoinByEnterpriseId; + public void setEnterpriseOfGridOperatorId(String enterpriseOfGridOperatorId) { + this.enterpriseOfGridOperatorId = enterpriseOfGridOperatorId; } - public String getArea1DictionaryName() { - return area1DictionaryName; + public String getUserId() { + return userId; } - public void setArea1DictionaryName(String area1DictionaryName) { - this.area1DictionaryName = area1DictionaryName; - } - - public String getArea1JoinByEnterpriseId() { - return area1JoinByEnterpriseId; - } - - public void setArea1JoinByEnterpriseId(String area1JoinByEnterpriseId) { - this.area1JoinByEnterpriseId = area1JoinByEnterpriseId; - } - - public String getArea2DictionaryName() { - return area2DictionaryName; - } - - public void setArea2DictionaryName(String area2DictionaryName) { - this.area2DictionaryName = area2DictionaryName; - } - - public String getArea2JoinByEnterpriseId() { - return area2JoinByEnterpriseId; - } - - public void setArea2JoinByEnterpriseId(String area2JoinByEnterpriseId) { - this.area2JoinByEnterpriseId = area2JoinByEnterpriseId; - } - - public String getArea3DictionaryName() { - return area3DictionaryName; - } - - public void setArea3DictionaryName(String area3DictionaryName) { - this.area3DictionaryName = area3DictionaryName; - } - - public String getArea3JoinByEnterpriseId() { - return area3JoinByEnterpriseId; - } - - public void setArea3JoinByEnterpriseId(String area3JoinByEnterpriseId) { - this.area3JoinByEnterpriseId = area3JoinByEnterpriseId; - } - - public String getArea4DictionaryName() { - return area4DictionaryName; - } - - public void setArea4DictionaryName(String area4DictionaryName) { - this.area4DictionaryName = area4DictionaryName; - } - - public String getArea4JoinByEnterpriseId() { - return area4JoinByEnterpriseId; - } - - public void setArea4JoinByEnterpriseId(String area4JoinByEnterpriseId) { - this.area4JoinByEnterpriseId = area4JoinByEnterpriseId; - } - - public String getArea5DictionaryName() { - return area5DictionaryName; - } - - public void setArea5DictionaryName(String area5DictionaryName) { - this.area5DictionaryName = area5DictionaryName; - } - - public String getArea5JoinByEnterpriseId() { - return area5JoinByEnterpriseId; - } - - public void setArea5JoinByEnterpriseId(String area5JoinByEnterpriseId) { - this.area5JoinByEnterpriseId = area5JoinByEnterpriseId; - } - - public String getEngagedCountJoinByEnterpriseId() { - return engagedCountJoinByEnterpriseId; - } - - public void setEngagedCountJoinByEnterpriseId(String engagedCountJoinByEnterpriseId) { - this.engagedCountJoinByEnterpriseId = engagedCountJoinByEnterpriseId; + public void setUserId(String userId) { + this.userId = userId; } public String getEnterpriseId() { @@ -202,38 +137,6 @@ public class CompanyListDataBean { this.enterpriseId = enterpriseId; } - public String getEnterpriseOfGridOperatorId() { - return enterpriseOfGridOperatorId; - } - - public void setEnterpriseOfGridOperatorId(String enterpriseOfGridOperatorId) { - this.enterpriseOfGridOperatorId = enterpriseOfGridOperatorId; - } - - public String getIndustryDictionaryName() { - return industryDictionaryName; - } - - public void setIndustryDictionaryName(String industryDictionaryName) { - this.industryDictionaryName = industryDictionaryName; - } - - public String getIndustryJoinByEnterpriseId() { - return industryJoinByEnterpriseId; - } - - public void setIndustryJoinByEnterpriseId(String industryJoinByEnterpriseId) { - this.industryJoinByEnterpriseId = industryJoinByEnterpriseId; - } - - public String getMasterJoinByEnterpriseId() { - return masterJoinByEnterpriseId; - } - - public void setMasterJoinByEnterpriseId(String masterJoinByEnterpriseId) { - this.masterJoinByEnterpriseId = masterJoinByEnterpriseId; - } - public String getNameJoinByEnterpriseId() { return nameJoinByEnterpriseId; } @@ -242,38 +145,6 @@ public class CompanyListDataBean { this.nameJoinByEnterpriseId = nameJoinByEnterpriseId; } - public String getPhoneJoinByEnterpriseId() { - return phoneJoinByEnterpriseId; - } - - public void setPhoneJoinByEnterpriseId(String phoneJoinByEnterpriseId) { - this.phoneJoinByEnterpriseId = phoneJoinByEnterpriseId; - } - - public String getRiskOperationDictionaryName() { - return riskOperationDictionaryName; - } - - public void setRiskOperationDictionaryName(String riskOperationDictionaryName) { - this.riskOperationDictionaryName = riskOperationDictionaryName; - } - - public String getRiskOperationJoinByEnterpriseId() { - return riskOperationJoinByEnterpriseId; - } - - public void setRiskOperationJoinByEnterpriseId(String riskOperationJoinByEnterpriseId) { - this.riskOperationJoinByEnterpriseId = riskOperationJoinByEnterpriseId; - } - - public String getTypeDictionaryName() { - return typeDictionaryName; - } - - public void setTypeDictionaryName(String typeDictionaryName) { - this.typeDictionaryName = typeDictionaryName; - } - public String getTypeJoinByEnterpriseId() { return typeJoinByEnterpriseId; } @@ -282,12 +153,212 @@ public class CompanyListDataBean { this.typeJoinByEnterpriseId = typeJoinByEnterpriseId; } - public String getUserId() { - return userId; + public String getArea1JoinByEnterpriseId() { + return area1JoinByEnterpriseId; } - public void setUserId(String userId) { - this.userId = userId; + public void setArea1JoinByEnterpriseId(String area1JoinByEnterpriseId) { + this.area1JoinByEnterpriseId = area1JoinByEnterpriseId; + } + + public String getArea2JoinByEnterpriseId() { + return area2JoinByEnterpriseId; + } + + public void setArea2JoinByEnterpriseId(String area2JoinByEnterpriseId) { + this.area2JoinByEnterpriseId = area2JoinByEnterpriseId; + } + + public String getArea3JoinByEnterpriseId() { + return area3JoinByEnterpriseId; + } + + public void setArea3JoinByEnterpriseId(String area3JoinByEnterpriseId) { + this.area3JoinByEnterpriseId = area3JoinByEnterpriseId; + } + + public String getArea4JoinByEnterpriseId() { + return area4JoinByEnterpriseId; + } + + public void setArea4JoinByEnterpriseId(String area4JoinByEnterpriseId) { + this.area4JoinByEnterpriseId = area4JoinByEnterpriseId; + } + + public String getArea5JoinByEnterpriseId() { + return area5JoinByEnterpriseId; + } + + public void setArea5JoinByEnterpriseId(String area5JoinByEnterpriseId) { + this.area5JoinByEnterpriseId = area5JoinByEnterpriseId; + } + + public String getAddressJoinByEnterpriseId() { + return addressJoinByEnterpriseId; + } + + public void setAddressJoinByEnterpriseId(String addressJoinByEnterpriseId) { + this.addressJoinByEnterpriseId = addressJoinByEnterpriseId; + } + + public String getIndustryJoinByEnterpriseId() { + return industryJoinByEnterpriseId; + } + + public void setIndustryJoinByEnterpriseId(String industryJoinByEnterpriseId) { + this.industryJoinByEnterpriseId = industryJoinByEnterpriseId; + } + + public String getEngagedCountJoinByEnterpriseId() { + return engagedCountJoinByEnterpriseId; + } + + public void setEngagedCountJoinByEnterpriseId(String engagedCountJoinByEnterpriseId) { + this.engagedCountJoinByEnterpriseId = engagedCountJoinByEnterpriseId; + } + + public String getRiskOperationJoinByEnterpriseId() { + return riskOperationJoinByEnterpriseId; + } + + public void setRiskOperationJoinByEnterpriseId(String riskOperationJoinByEnterpriseId) { + this.riskOperationJoinByEnterpriseId = riskOperationJoinByEnterpriseId; + } + + public String getMasterJoinByEnterpriseId() { + return masterJoinByEnterpriseId; + } + + public void setMasterJoinByEnterpriseId(String masterJoinByEnterpriseId) { + this.masterJoinByEnterpriseId = masterJoinByEnterpriseId; + } + + public String getPhoneJoinByEnterpriseId() { + return phoneJoinByEnterpriseId; + } + + public void setPhoneJoinByEnterpriseId(String phoneJoinByEnterpriseId) { + this.phoneJoinByEnterpriseId = phoneJoinByEnterpriseId; + } + + public String getArea1DictionaryName() { + return area1DictionaryName; + } + + public void setArea1DictionaryName(String area1DictionaryName) { + this.area1DictionaryName = area1DictionaryName; + } + + public String getArea2DictionaryName() { + return area2DictionaryName; + } + + public void setArea2DictionaryName(String area2DictionaryName) { + this.area2DictionaryName = area2DictionaryName; + } + + public String getArea3DictionaryName() { + return area3DictionaryName; + } + + public void setArea3DictionaryName(String area3DictionaryName) { + this.area3DictionaryName = area3DictionaryName; + } + + public String getArea4DictionaryName() { + return area4DictionaryName; + } + + public void setArea4DictionaryName(String area4DictionaryName) { + this.area4DictionaryName = area4DictionaryName; + } + + public String getArea5DictionaryName() { + return area5DictionaryName; + } + + public void setArea5DictionaryName(String area5DictionaryName) { + this.area5DictionaryName = area5DictionaryName; + } + + public String getIndustryDictionaryName() { + return industryDictionaryName; + } + + public void setIndustryDictionaryName(String industryDictionaryName) { + this.industryDictionaryName = industryDictionaryName; + } + + public String getRiskOperationDictionaryName() { + return riskOperationDictionaryName; + } + + public void setRiskOperationDictionaryName(String riskOperationDictionaryName) { + this.riskOperationDictionaryName = riskOperationDictionaryName; + } + + public String getTypeDictionaryName() { + return typeDictionaryName; + } + + public void setTypeDictionaryName(String typeDictionaryName) { + this.typeDictionaryName = typeDictionaryName; + } + + public String getIndustryTypeJoinByEnterpriseId() { + return industryTypeJoinByEnterpriseId; + } + + public void setIndustryTypeJoinByEnterpriseId(String industryTypeJoinByEnterpriseId) { + this.industryTypeJoinByEnterpriseId = industryTypeJoinByEnterpriseId; + } + + public String getIndustryTypeDictionaryName() { + return industryTypeDictionaryName; + } + + public void setIndustryTypeDictionaryName(String industryTypeDictionaryName) { + this.industryTypeDictionaryName = industryTypeDictionaryName; + } + + public String getLegalPerson() { + return legalPerson; + } + + public void setLegalPerson(String legalPerson) { + this.legalPerson = legalPerson; + } + + public String getClassifyJoinByEnterpriseId() { + return classifyJoinByEnterpriseId; + } + + public void setClassifyJoinByEnterpriseId(String classifyJoinByEnterpriseId) { + this.classifyJoinByEnterpriseId = classifyJoinByEnterpriseId; + } + + public String getClassifyDictionaryName() { + return classifyDictionaryName; + } + + public void setClassifyDictionaryName(String classifyDictionaryName) { + this.classifyDictionaryName = classifyDictionaryName; + } + + public String getNatureJoinByEnterpriseId() { + return natureJoinByEnterpriseId; + } + + public void setNatureJoinByEnterpriseId(String natureJoinByEnterpriseId) { + this.natureJoinByEnterpriseId = natureJoinByEnterpriseId; + } + + public String getNatureDictionaryName() { + return natureDictionaryName; + } + + public void setNatureDictionaryName(String natureDictionaryName) { + this.natureDictionaryName = natureDictionaryName; } } } diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CounterCheckOptionsBean.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CounterCheckOptionsBean.java index 097e114..938b212 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CounterCheckOptionsBean.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CounterCheckOptionsBean.java @@ -1,5 +1,7 @@ package com.sucstepsoft.txrealtimelocation.beans; +import java.util.List; + /** * 作者: adam * 日期: 2020/4/2 - 11:28 AM @@ -8,17 +10,26 @@ package com.sucstepsoft.txrealtimelocation.beans; */ public class CounterCheckOptionsBean { + /** - * checkItemId : a1c27ea5-40dd-4cc8-974c-d387f8ba428c - * name : 照明 - * summary : 照明 - * type : 1 + * checkItemId : bde68ea3-a271-42c2-bdcd-8f9a7e43f837 + * name : 培训制度 + * parentName : + * summary : 培训制度 + * type : 2 + * checkItemParentId : + * checkItemOptions : [{"checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","type":1,"name":"有","unit":"","isWrong":0},{"checkItemOptionId":"20515bae-5bfb-404a-8317-df3e3feb44e8","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","type":1,"name":"无","unit":"","isWrong":1}] + * hiddenDangerReports : [] */ private String checkItemId; private String name; + private String parentName; private String summary; private int type; + private String checkItemParentId; + private List checkItemOptions; + private List hiddenDangerReports; public String getCheckItemId() { return checkItemId; @@ -36,6 +47,14 @@ public class CounterCheckOptionsBean { this.name = name; } + public String getParentName() { + return parentName; + } + + public void setParentName(String parentName) { + this.parentName = parentName; + } + public String getSummary() { return summary; } @@ -51,4 +70,94 @@ public class CounterCheckOptionsBean { public void setType(int type) { this.type = type; } + + public String getCheckItemParentId() { + return checkItemParentId; + } + + public void setCheckItemParentId(String checkItemParentId) { + this.checkItemParentId = checkItemParentId; + } + + public List getCheckItemOptions() { + return checkItemOptions; + } + + public void setCheckItemOptions(List checkItemOptions) { + this.checkItemOptions = checkItemOptions; + } + + public List getHiddenDangerReports() { + return hiddenDangerReports; + } + + public void setHiddenDangerReports(List hiddenDangerReports) { + this.hiddenDangerReports = hiddenDangerReports; + } + + public static class CheckItemOptionsBean { + /** + * checkItemOptionId : 714cb2b5-9443-41fe-a565-ed28f9211268 + * checkItemId : bde68ea3-a271-42c2-bdcd-8f9a7e43f837 + * type : 1 + * name : 有 + * unit : + * isWrong : 0 + */ + + private String checkItemOptionId; + private String checkItemId; + private int type; + private String name; + private String unit; + private int isWrong; + + public String getCheckItemOptionId() { + return checkItemOptionId; + } + + public void setCheckItemOptionId(String checkItemOptionId) { + this.checkItemOptionId = checkItemOptionId; + } + + public String getCheckItemId() { + return checkItemId; + } + + public void setCheckItemId(String checkItemId) { + this.checkItemId = checkItemId; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + + public int getIsWrong() { + return isWrong; + } + + public void setIsWrong(int isWrong) { + this.isWrong = isWrong; + } + } } diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/HistoryDetialBean.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/HistoryDetialBean.java new file mode 100644 index 0000000..532f886 --- /dev/null +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/HistoryDetialBean.java @@ -0,0 +1,508 @@ +package com.sucstepsoft.txrealtimelocation.beans; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2020/4/16 - 2:16 PM + * 邮箱: itgaojian@163.com + * 描述: + */ +public class HistoryDetialBean { + + /** + * checkId : 3ece2bbd-a540-4c84-b14d-0d17525d37dc + * enterpriseId : b4b4847d-c182-42c2-b699-e412e0fe12c2 + * nameJoinByEnterpriseId : 青山区新达厨卫洁具店 + * typeJoinByEnterpriseId : + * typeDictionaryName : + * area1JoinByEnterpriseId : + * area2JoinByEnterpriseId : + * area3JoinByEnterpriseId : + * area4JoinByEnterpriseId : + * area5JoinByEnterpriseId : + * addressJoinByEnterpriseId : + * industryJoinByEnterpriseId : + * industryDictionaryName : + * engagedCountJoinByEnterpriseId : + * riskOperationJoinByEnterpriseId : + * riskOperationDictionaryName : + * masterJoinByEnterpriseId : + * phoneJoinByEnterpriseId : + * checkType : 1 + * isCoordination : 1 + * isComplete : 1 + * rectificationType : 1 + * immediatelyChangeType : 2 + * rectificationDays : 0 + * scenePhotos : + * summary : + * checkLng : + * checkLat : + * gmtCreate : 2020-04-16 15:22:50 + * checkItems : [{"checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","name":"培训制度","parentName":"","summary":"培训制度","type":2,"checkItemParentId":"","checkItemOptions":[],"hiddenDangerReports":[{"hiddenDangerReportId":"56157962-0841-4a92-8b0c-ff0706780b49","checkId":"5f713cc6-bea8-4e32-bd63-39d82bae4e94","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","type":2,"checkItemType":1,"checkResult":"714cb2b5-9443-41fe-a565-ed28f9211268","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"9aa9f5c5-573b-4e0d-9efb-448194f1078e","checkId":"3765ecc0-2873-41b1-8d11-65642478a0a0","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","type":2,"checkItemType":1,"checkResult":"714cb2b5-9443-41fe-a565-ed28f9211268","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"1b0e2462-9513-44c5-ade1-85e0d5c6bfbf","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","type":2,"checkItemType":1,"checkResult":"714cb2b5-9443-41fe-a565-ed28f9211268","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"f4771d29-7eca-4313-8575-951b0057cafc","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","type":2,"checkItemType":1,"checkResult":"714cb2b5-9443-41fe-a565-ed28f9211268","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"39bc63c3-994c-43a5-bca4-548792f2d119","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","type":2,"checkItemType":1,"checkResult":"714cb2b5-9443-41fe-a565-ed28f9211268","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"619602ef-2b88-484d-8bd1-fc1e2b2fe848","checkId":"3ece2bbd-a540-4c84-b14d-0d17525d37dc","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","type":2,"checkItemType":1,"checkResult":"714cb2b5-9443-41fe-a565-ed28f9211268","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"e462d0f6-f304-4b45-a250-7c02cdbd118b","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"20515bae-5bfb-404a-8317-df3e3feb44e8","type":2,"checkItemType":1,"checkResult":"20515bae-5bfb-404a-8317-df3e3feb44e8","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"3124f163-00c3-4252-b993-bd94fe7a1aca","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"20515bae-5bfb-404a-8317-df3e3feb44e8","type":2,"checkItemType":1,"checkResult":"20515bae-5bfb-404a-8317-df3e3feb44e8","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"97e80f63-5d05-4c2d-ac1a-23368413a29f","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"20515bae-5bfb-404a-8317-df3e3feb44e8","type":2,"checkItemType":1,"checkResult":"20515bae-5bfb-404a-8317-df3e3feb44e8","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""}]},{"checkItemId":"ee6ee72d-0031-4b6a-a0e2-566f26316ecd","name":"安全生产责任制","parentName":"","summary":"安全生产责任制","type":2,"checkItemParentId":"","checkItemOptions":[],"hiddenDangerReports":[{"hiddenDangerReportId":"b1962b0f-5d02-45ae-aa0e-9130b754a0ba","checkId":"5f713cc6-bea8-4e32-bd63-39d82bae4e94","checkItemId":"ee6ee72d-0031-4b6a-a0e2-566f26316ecd","checkItemOptionId":"946ac567-2fa9-4c0a-9964-4cad82ceeca0","type":2,"checkItemType":1,"checkResult":"946ac567-2fa9-4c0a-9964-4cad82ceeca0","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"4dfe68dd-d41d-43e5-879e-ba81a871e8f1","checkId":"3765ecc0-2873-41b1-8d11-65642478a0a0","checkItemId":"ee6ee72d-0031-4b6a-a0e2-566f26316ecd","checkItemOptionId":"946ac567-2fa9-4c0a-9964-4cad82ceeca0","type":2,"checkItemType":1,"checkResult":"946ac567-2fa9-4c0a-9964-4cad82ceeca0","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"34fc88b6-dfed-4fdf-9676-1fd40c8d81a9","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"ee6ee72d-0031-4b6a-a0e2-566f26316ecd","checkItemOptionId":"946ac567-2fa9-4c0a-9964-4cad82ceeca0","type":2,"checkItemType":1,"checkResult":"946ac567-2fa9-4c0a-9964-4cad82ceeca0","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"bb6c2bed-8ecd-488d-be89-74591eaea841","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"ee6ee72d-0031-4b6a-a0e2-566f26316ecd","checkItemOptionId":"946ac567-2fa9-4c0a-9964-4cad82ceeca0","type":2,"checkItemType":1,"checkResult":"946ac567-2fa9-4c0a-9964-4cad82ceeca0","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"3509acb0-4976-464a-81df-1d0abd8cfad4","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"ee6ee72d-0031-4b6a-a0e2-566f26316ecd","checkItemOptionId":"946ac567-2fa9-4c0a-9964-4cad82ceeca0","type":2,"checkItemType":1,"checkResult":"946ac567-2fa9-4c0a-9964-4cad82ceeca0","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"83981a6a-6c3b-412a-b1e0-4884f4ccbb4c","checkId":"3ece2bbd-a540-4c84-b14d-0d17525d37dc","checkItemId":"ee6ee72d-0031-4b6a-a0e2-566f26316ecd","checkItemOptionId":"946ac567-2fa9-4c0a-9964-4cad82ceeca0","type":2,"checkItemType":1,"checkResult":"946ac567-2fa9-4c0a-9964-4cad82ceeca0","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"4a5b51ad-b6ab-41d3-9150-947479b80890","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"ee6ee72d-0031-4b6a-a0e2-566f26316ecd","checkItemOptionId":"7bd0da26-a50e-4fa3-afb8-901fce5869f0","type":2,"checkItemType":1,"checkResult":"7bd0da26-a50e-4fa3-afb8-901fce5869f0","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"eb256f43-fd6a-4ede-b6c1-1f71e24d448f","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"ee6ee72d-0031-4b6a-a0e2-566f26316ecd","checkItemOptionId":"7bd0da26-a50e-4fa3-afb8-901fce5869f0","type":2,"checkItemType":1,"checkResult":"7bd0da26-a50e-4fa3-afb8-901fce5869f0","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"47b9cf6a-c8a1-40c5-a670-8e8996ff013c","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"ee6ee72d-0031-4b6a-a0e2-566f26316ecd","checkItemOptionId":"7bd0da26-a50e-4fa3-afb8-901fce5869f0","type":2,"checkItemType":1,"checkResult":"7bd0da26-a50e-4fa3-afb8-901fce5869f0","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""}]},{"checkItemId":"1aafe380-4fc4-454f-b5b7-8039f8113952","name":"安全生产隐患排查制度","parentName":"","summary":"安全生产隐患排查制度","type":1,"checkItemParentId":"","checkItemOptions":[],"hiddenDangerReports":[{"hiddenDangerReportId":"d19cb80b-b75b-41ae-a114-ade131b8184e","checkId":"5f713cc6-bea8-4e32-bd63-39d82bae4e94","checkItemId":"1aafe380-4fc4-454f-b5b7-8039f8113952","checkItemOptionId":"b64af6b9-9d78-486f-824f-ff4d71bde653","type":1,"checkItemType":1,"checkResult":"b64af6b9-9d78-486f-824f-ff4d71bde653","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"ecba76cf-9600-4817-aa2d-f2ae9fbf76aa","checkId":"3765ecc0-2873-41b1-8d11-65642478a0a0","checkItemId":"1aafe380-4fc4-454f-b5b7-8039f8113952","checkItemOptionId":"b64af6b9-9d78-486f-824f-ff4d71bde653","type":1,"checkItemType":1,"checkResult":"b64af6b9-9d78-486f-824f-ff4d71bde653","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"036e4520-cd41-40fb-a550-05bef1d1d155","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"1aafe380-4fc4-454f-b5b7-8039f8113952","checkItemOptionId":"b64af6b9-9d78-486f-824f-ff4d71bde653","type":1,"checkItemType":1,"checkResult":"b64af6b9-9d78-486f-824f-ff4d71bde653","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"44f5ccd8-5bbb-4a0f-a9a8-e433629e7ba1","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"1aafe380-4fc4-454f-b5b7-8039f8113952","checkItemOptionId":"b64af6b9-9d78-486f-824f-ff4d71bde653","type":1,"checkItemType":1,"checkResult":"b64af6b9-9d78-486f-824f-ff4d71bde653","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"5b19d317-2c88-429a-8120-dd2f1c13e1e3","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"1aafe380-4fc4-454f-b5b7-8039f8113952","checkItemOptionId":"b64af6b9-9d78-486f-824f-ff4d71bde653","type":1,"checkItemType":1,"checkResult":"b64af6b9-9d78-486f-824f-ff4d71bde653","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"43ab6188-bb4d-414d-ada3-d97aa292991a","checkId":"3ece2bbd-a540-4c84-b14d-0d17525d37dc","checkItemId":"1aafe380-4fc4-454f-b5b7-8039f8113952","checkItemOptionId":"b64af6b9-9d78-486f-824f-ff4d71bde653","type":1,"checkItemType":1,"checkResult":"b64af6b9-9d78-486f-824f-ff4d71bde653","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"4b155c71-78e6-458e-ae1e-89711ce40c42","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"1aafe380-4fc4-454f-b5b7-8039f8113952","checkItemOptionId":"2db04929-eba1-40a6-aae9-5547e6715167","type":1,"checkItemType":1,"checkResult":"2db04929-eba1-40a6-aae9-5547e6715167","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"6d25deec-ac90-40a4-ba30-6ddeebfde87b","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"1aafe380-4fc4-454f-b5b7-8039f8113952","checkItemOptionId":"2db04929-eba1-40a6-aae9-5547e6715167","type":1,"checkItemType":1,"checkResult":"2db04929-eba1-40a6-aae9-5547e6715167","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"940ab9d9-6728-462a-a5b3-b464e2492deb","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"1aafe380-4fc4-454f-b5b7-8039f8113952","checkItemOptionId":"2db04929-eba1-40a6-aae9-5547e6715167","type":1,"checkItemType":1,"checkResult":"2db04929-eba1-40a6-aae9-5547e6715167","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""}]},{"checkItemId":"067afee6-3528-4fa6-8dc1-5d32fe1cd6f7","name":"是否超期未检","parentName":"","summary":"是否超期未检","type":1,"checkItemParentId":"","checkItemOptions":[],"hiddenDangerReports":[{"hiddenDangerReportId":"fbcdfb5f-3d05-4721-9ebc-32a82641f455","checkId":"5f713cc6-bea8-4e32-bd63-39d82bae4e94","checkItemId":"067afee6-3528-4fa6-8dc1-5d32fe1cd6f7","checkItemOptionId":"67e1a507-6625-411e-a89f-334594a0a88a","type":1,"checkItemType":1,"checkResult":"67e1a507-6625-411e-a89f-334594a0a88a","nameJoinByCheckItemId":"是","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"3ed748c3-f1f6-46ba-b064-aba8c9004b4e","checkId":"3765ecc0-2873-41b1-8d11-65642478a0a0","checkItemId":"067afee6-3528-4fa6-8dc1-5d32fe1cd6f7","checkItemOptionId":"67e1a507-6625-411e-a89f-334594a0a88a","type":1,"checkItemType":1,"checkResult":"67e1a507-6625-411e-a89f-334594a0a88a","nameJoinByCheckItemId":"是","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"ca172297-3764-4262-9d5d-d38a8b40621f","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"067afee6-3528-4fa6-8dc1-5d32fe1cd6f7","checkItemOptionId":"67e1a507-6625-411e-a89f-334594a0a88a","type":1,"checkItemType":1,"checkResult":"67e1a507-6625-411e-a89f-334594a0a88a","nameJoinByCheckItemId":"是","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"ec3ddfe8-ff72-4acc-96d0-12785b6a13ea","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"067afee6-3528-4fa6-8dc1-5d32fe1cd6f7","checkItemOptionId":"67e1a507-6625-411e-a89f-334594a0a88a","type":1,"checkItemType":1,"checkResult":"67e1a507-6625-411e-a89f-334594a0a88a","nameJoinByCheckItemId":"是","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"8db12238-bc00-40a7-893e-a21aade8235d","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"067afee6-3528-4fa6-8dc1-5d32fe1cd6f7","checkItemOptionId":"67e1a507-6625-411e-a89f-334594a0a88a","type":1,"checkItemType":1,"checkResult":"67e1a507-6625-411e-a89f-334594a0a88a","nameJoinByCheckItemId":"是","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"339e69ae-aa16-4bb3-9971-8b1970fbfe33","checkId":"3ece2bbd-a540-4c84-b14d-0d17525d37dc","checkItemId":"067afee6-3528-4fa6-8dc1-5d32fe1cd6f7","checkItemOptionId":"67e1a507-6625-411e-a89f-334594a0a88a","type":1,"checkItemType":1,"checkResult":"67e1a507-6625-411e-a89f-334594a0a88a","nameJoinByCheckItemId":"是","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"75e719fc-96b7-4d6a-8850-df38aca9f73c","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"067afee6-3528-4fa6-8dc1-5d32fe1cd6f7","checkItemOptionId":"b6cc5f8a-fd84-481b-a476-d684786b350f","type":1,"checkItemType":1,"checkResult":"b6cc5f8a-fd84-481b-a476-d684786b350f","nameJoinByCheckItemId":"否","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"7ac5d1fb-d6b1-4648-a542-58041e6fb333","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"067afee6-3528-4fa6-8dc1-5d32fe1cd6f7","checkItemOptionId":"b6cc5f8a-fd84-481b-a476-d684786b350f","type":1,"checkItemType":1,"checkResult":"b6cc5f8a-fd84-481b-a476-d684786b350f","nameJoinByCheckItemId":"否","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"dffa7fdb-bbaa-4c5b-82c0-21182b2ed55c","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"067afee6-3528-4fa6-8dc1-5d32fe1cd6f7","checkItemOptionId":"b6cc5f8a-fd84-481b-a476-d684786b350f","type":1,"checkItemType":1,"checkResult":"b6cc5f8a-fd84-481b-a476-d684786b350f","nameJoinByCheckItemId":"否","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""}]},{"checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","name":"机构人员","parentName":"","summary":"机构人员","type":2,"checkItemParentId":"","checkItemOptions":[],"hiddenDangerReports":[{"hiddenDangerReportId":"1b6ef450-5cfa-4037-8d47-7980ee29cfe1","checkId":"5f713cc6-bea8-4e32-bd63-39d82bae4e94","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"f0235379-5e4d-403f-a2a4-bad22ddbab89","type":2,"checkItemType":1,"checkResult":"f0235379-5e4d-403f-a2a4-bad22ddbab89","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"b65afb14-5c21-4ce5-81bb-8c45aed781ec","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"f0235379-5e4d-403f-a2a4-bad22ddbab89","type":2,"checkItemType":1,"checkResult":"f0235379-5e4d-403f-a2a4-bad22ddbab89","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"ea3bf915-d729-4e7f-8ce6-b07cd0546324","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"f0235379-5e4d-403f-a2a4-bad22ddbab89","type":2,"checkItemType":1,"checkResult":"f0235379-5e4d-403f-a2a4-bad22ddbab89","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"c0c2f354-14c6-4efa-bbcd-4dd0277eb477","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"f0235379-5e4d-403f-a2a4-bad22ddbab89","type":2,"checkItemType":1,"checkResult":"f0235379-5e4d-403f-a2a4-bad22ddbab89","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"e57060ac-7356-489f-af75-0b8325620e1f","checkId":"3ece2bbd-a540-4c84-b14d-0d17525d37dc","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"f0235379-5e4d-403f-a2a4-bad22ddbab89","type":2,"checkItemType":1,"checkResult":"f0235379-5e4d-403f-a2a4-bad22ddbab89","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"f8538d4c-be27-4cd4-ada7-7c31d40726ef","checkId":"3765ecc0-2873-41b1-8d11-65642478a0a0","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"8586b2f5-4264-4c96-8b1c-7ad1faf8149a","type":2,"checkItemType":1,"checkResult":"8586b2f5-4264-4c96-8b1c-7ad1faf8149a","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"07267415-ddd1-49c5-a466-3e063c4c45f8","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"8586b2f5-4264-4c96-8b1c-7ad1faf8149a","type":2,"checkItemType":1,"checkResult":"8586b2f5-4264-4c96-8b1c-7ad1faf8149a","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"3e58e5ae-667f-478c-b516-d3e56d0e63d1","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"8586b2f5-4264-4c96-8b1c-7ad1faf8149a","type":2,"checkItemType":1,"checkResult":"8586b2f5-4264-4c96-8b1c-7ad1faf8149a","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"c0d86a1d-57e2-49d0-ab4b-590b19dec2db","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"8586b2f5-4264-4c96-8b1c-7ad1faf8149a","type":2,"checkItemType":1,"checkResult":"8586b2f5-4264-4c96-8b1c-7ad1faf8149a","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"f44d2236-c635-456c-a8b4-8c927d7580ec","checkId":"5f713cc6-bea8-4e32-bd63-39d82bae4e94","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"c43e2e14-a8d4-4fa1-ad49-e25fb56164f1","type":2,"checkItemType":2,"checkResult":"11","nameJoinByCheckItemId":"人数","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":"人"},{"hiddenDangerReportId":"244fcd33-c635-45c1-8e48-d3261f03a3a6","checkId":"3765ecc0-2873-41b1-8d11-65642478a0a0","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"c43e2e14-a8d4-4fa1-ad49-e25fb56164f1","type":2,"checkItemType":2,"checkResult":"1","nameJoinByCheckItemId":"人数","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":"人"},{"hiddenDangerReportId":"e5adbd5c-2d2a-4c22-80d0-46ccd51c33e4","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"c43e2e14-a8d4-4fa1-ad49-e25fb56164f1","type":2,"checkItemType":2,"checkResult":"5","nameJoinByCheckItemId":"人数","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":"人"},{"hiddenDangerReportId":"3cbd500d-8548-4889-a513-e92a83cadd5a","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"c43e2e14-a8d4-4fa1-ad49-e25fb56164f1","type":2,"checkItemType":2,"checkResult":"5","nameJoinByCheckItemId":"人数","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":"人"},{"hiddenDangerReportId":"bf083246-2402-474a-a038-80bb03292d4a","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"c43e2e14-a8d4-4fa1-ad49-e25fb56164f1","type":2,"checkItemType":2,"checkResult":"5","nameJoinByCheckItemId":"人数","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":"人"},{"hiddenDangerReportId":"c9af2d13-0185-431c-8757-358556496079","checkId":"3ece2bbd-a540-4c84-b14d-0d17525d37dc","checkItemId":"a1c27ea5-40dd-4cc8-974c-d387f8ba428c","checkItemOptionId":"c43e2e14-a8d4-4fa1-ad49-e25fb56164f1","type":2,"checkItemType":2,"checkResult":"","nameJoinByCheckItemId":"人数","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":"人"}]},{"checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","name":"纯文本测试","parentName":"","summary":"纯文本测试","type":1,"checkItemParentId":"","checkItemOptions":[],"hiddenDangerReports":[{"hiddenDangerReportId":"c104dfe3-cabd-4d78-b448-d59858116dc5","checkId":"5f713cc6-bea8-4e32-bd63-39d82bae4e94","checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","checkItemOptionId":"1d3ea6d6-1063-4ce3-b88e-66bc19906cbf","type":1,"checkItemType":2,"checkResult":"11","nameJoinByCheckItemId":"数字","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":"个"},{"hiddenDangerReportId":"a6ca5cca-4320-416a-adac-0003409d6d77","checkId":"3765ecc0-2873-41b1-8d11-65642478a0a0","checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","checkItemOptionId":"1d3ea6d6-1063-4ce3-b88e-66bc19906cbf","type":1,"checkItemType":2,"checkResult":"1","nameJoinByCheckItemId":"数字","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":"个"},{"hiddenDangerReportId":"c3fec2c4-ccee-4d95-a44b-aa320e558aed","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","checkItemOptionId":"1d3ea6d6-1063-4ce3-b88e-66bc19906cbf","type":1,"checkItemType":2,"checkResult":"8888","nameJoinByCheckItemId":"数字","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":"个"},{"hiddenDangerReportId":"b36f80ac-e4a7-4952-a804-22fb64b64707","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","checkItemOptionId":"1d3ea6d6-1063-4ce3-b88e-66bc19906cbf","type":1,"checkItemType":2,"checkResult":"58","nameJoinByCheckItemId":"数字","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":"个"},{"hiddenDangerReportId":"0d233803-4aee-44af-9dbb-ad9045c0a9b0","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","checkItemOptionId":"1d3ea6d6-1063-4ce3-b88e-66bc19906cbf","type":1,"checkItemType":2,"checkResult":"6","nameJoinByCheckItemId":"数字","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":"个"},{"hiddenDangerReportId":"2fb0cdd0-28af-45e5-86a3-6505c19df102","checkId":"3ece2bbd-a540-4c84-b14d-0d17525d37dc","checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","checkItemOptionId":"1d3ea6d6-1063-4ce3-b88e-66bc19906cbf","type":1,"checkItemType":2,"checkResult":"","nameJoinByCheckItemId":"数字","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":"个"},{"hiddenDangerReportId":"532d326e-d0c9-44c6-af90-099bd38528b7","checkId":"5f713cc6-bea8-4e32-bd63-39d82bae4e94","checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","checkItemOptionId":"a928464d-e8f3-469e-9ce7-10c4a82451ff","type":1,"checkItemType":3,"checkResult":"66666666","nameJoinByCheckItemId":"文本","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"c3f282a3-a312-43be-9415-2ff749931ba1","checkId":"3765ecc0-2873-41b1-8d11-65642478a0a0","checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","checkItemOptionId":"a928464d-e8f3-469e-9ce7-10c4a82451ff","type":1,"checkItemType":3,"checkResult":"1","nameJoinByCheckItemId":"文本","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"e3f18be3-fdbe-4142-9770-a644bc54bb9b","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","checkItemOptionId":"a928464d-e8f3-469e-9ce7-10c4a82451ff","type":1,"checkItemType":3,"checkResult":"测试","nameJoinByCheckItemId":"文本","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"57a60b21-0675-4757-ba1f-7ac099b71ac2","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","checkItemOptionId":"a928464d-e8f3-469e-9ce7-10c4a82451ff","type":1,"checkItemType":3,"checkResult":"很多好多好多","nameJoinByCheckItemId":"文本","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"8106d798-7052-444b-a9c9-447580c693e5","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","checkItemOptionId":"a928464d-e8f3-469e-9ce7-10c4a82451ff","type":1,"checkItemType":3,"checkResult":"好多好多和","nameJoinByCheckItemId":"文本","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"9f229586-88be-447a-922b-cd9d27a4f032","checkId":"3ece2bbd-a540-4c84-b14d-0d17525d37dc","checkItemId":"6ae3b8ea-06ef-4683-9689-2737f223e774","checkItemOptionId":"a928464d-e8f3-469e-9ce7-10c4a82451ff","type":1,"checkItemType":3,"checkResult":"","nameJoinByCheckItemId":"文本","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""}]},{"checkItemId":"d37491ee-146e-430e-b155-2256fc0c4957","name":"营业执照","parentName":"","summary":"营业执照","type":1,"checkItemParentId":"","checkItemOptions":[],"hiddenDangerReports":[{"hiddenDangerReportId":"8043c2f4-6c30-4a49-8f37-440923b664cf","checkId":"5f713cc6-bea8-4e32-bd63-39d82bae4e94","checkItemId":"d37491ee-146e-430e-b155-2256fc0c4957","checkItemOptionId":"6ba68e00-4c67-4974-9d8b-5f7e3f2e7027","type":1,"checkItemType":1,"checkResult":"6ba68e00-4c67-4974-9d8b-5f7e3f2e7027","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"0da48c54-2aa3-4d38-a905-28a452277fc8","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"d37491ee-146e-430e-b155-2256fc0c4957","checkItemOptionId":"6ba68e00-4c67-4974-9d8b-5f7e3f2e7027","type":1,"checkItemType":1,"checkResult":"6ba68e00-4c67-4974-9d8b-5f7e3f2e7027","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"4cf1f19f-03ab-4e05-8315-03da839025e4","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"d37491ee-146e-430e-b155-2256fc0c4957","checkItemOptionId":"6ba68e00-4c67-4974-9d8b-5f7e3f2e7027","type":1,"checkItemType":1,"checkResult":"6ba68e00-4c67-4974-9d8b-5f7e3f2e7027","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"1851e012-c31d-4cbf-b70c-12b5752d732d","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"d37491ee-146e-430e-b155-2256fc0c4957","checkItemOptionId":"6ba68e00-4c67-4974-9d8b-5f7e3f2e7027","type":1,"checkItemType":1,"checkResult":"6ba68e00-4c67-4974-9d8b-5f7e3f2e7027","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"e83e8f6b-3b50-4f5b-a266-874c2db6109b","checkId":"3ece2bbd-a540-4c84-b14d-0d17525d37dc","checkItemId":"d37491ee-146e-430e-b155-2256fc0c4957","checkItemOptionId":"6ba68e00-4c67-4974-9d8b-5f7e3f2e7027","type":1,"checkItemType":1,"checkResult":"6ba68e00-4c67-4974-9d8b-5f7e3f2e7027","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"c7a101a7-53f7-4538-b4fd-d3d89ed82c3f","checkId":"3765ecc0-2873-41b1-8d11-65642478a0a0","checkItemId":"d37491ee-146e-430e-b155-2256fc0c4957","checkItemOptionId":"675a2ead-c22c-4415-94bb-4c8543a4337a","type":1,"checkItemType":1,"checkResult":"675a2ead-c22c-4415-94bb-4c8543a4337a","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"c8ebc1fa-8d82-4995-8fa4-665cc3bed804","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"d37491ee-146e-430e-b155-2256fc0c4957","checkItemOptionId":"675a2ead-c22c-4415-94bb-4c8543a4337a","type":1,"checkItemType":1,"checkResult":"675a2ead-c22c-4415-94bb-4c8543a4337a","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"52885f4f-18d8-47a5-bf5b-2ee698d2cce4","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"d37491ee-146e-430e-b155-2256fc0c4957","checkItemOptionId":"675a2ead-c22c-4415-94bb-4c8543a4337a","type":1,"checkItemType":1,"checkResult":"675a2ead-c22c-4415-94bb-4c8543a4337a","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"0b24139b-1280-4730-82e6-5cc4825ce367","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"d37491ee-146e-430e-b155-2256fc0c4957","checkItemOptionId":"675a2ead-c22c-4415-94bb-4c8543a4337a","type":1,"checkItemType":1,"checkResult":"675a2ead-c22c-4415-94bb-4c8543a4337a","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""}]}] + */ + + private String checkId; + private String enterpriseId; + private String nameJoinByEnterpriseId; + private String typeJoinByEnterpriseId; + private String typeDictionaryName; + private String area1JoinByEnterpriseId; + private String area2JoinByEnterpriseId; + private String area3JoinByEnterpriseId; + private String area4JoinByEnterpriseId; + private String area5JoinByEnterpriseId; + private String addressJoinByEnterpriseId; + private String industryJoinByEnterpriseId; + private String industryDictionaryName; + private String engagedCountJoinByEnterpriseId; + private String riskOperationJoinByEnterpriseId; + private String riskOperationDictionaryName; + private String masterJoinByEnterpriseId; + private String phoneJoinByEnterpriseId; + private int checkType; + private int isCoordination; + private int isComplete; + private int rectificationType; + private int immediatelyChangeType; + private int rectificationDays; + private String scenePhotos; + private String summary; + private String checkLng; + private String checkLat; + private String gmtCreate; + private List checkItems; + + public String getCheckId() { + return checkId; + } + + public void setCheckId(String checkId) { + this.checkId = checkId; + } + + public String getEnterpriseId() { + return enterpriseId; + } + + public void setEnterpriseId(String enterpriseId) { + this.enterpriseId = enterpriseId; + } + + public String getNameJoinByEnterpriseId() { + return nameJoinByEnterpriseId; + } + + public void setNameJoinByEnterpriseId(String nameJoinByEnterpriseId) { + this.nameJoinByEnterpriseId = nameJoinByEnterpriseId; + } + + public String getTypeJoinByEnterpriseId() { + return typeJoinByEnterpriseId; + } + + public void setTypeJoinByEnterpriseId(String typeJoinByEnterpriseId) { + this.typeJoinByEnterpriseId = typeJoinByEnterpriseId; + } + + public String getTypeDictionaryName() { + return typeDictionaryName; + } + + public void setTypeDictionaryName(String typeDictionaryName) { + this.typeDictionaryName = typeDictionaryName; + } + + public String getArea1JoinByEnterpriseId() { + return area1JoinByEnterpriseId; + } + + public void setArea1JoinByEnterpriseId(String area1JoinByEnterpriseId) { + this.area1JoinByEnterpriseId = area1JoinByEnterpriseId; + } + + public String getArea2JoinByEnterpriseId() { + return area2JoinByEnterpriseId; + } + + public void setArea2JoinByEnterpriseId(String area2JoinByEnterpriseId) { + this.area2JoinByEnterpriseId = area2JoinByEnterpriseId; + } + + public String getArea3JoinByEnterpriseId() { + return area3JoinByEnterpriseId; + } + + public void setArea3JoinByEnterpriseId(String area3JoinByEnterpriseId) { + this.area3JoinByEnterpriseId = area3JoinByEnterpriseId; + } + + public String getArea4JoinByEnterpriseId() { + return area4JoinByEnterpriseId; + } + + public void setArea4JoinByEnterpriseId(String area4JoinByEnterpriseId) { + this.area4JoinByEnterpriseId = area4JoinByEnterpriseId; + } + + public String getArea5JoinByEnterpriseId() { + return area5JoinByEnterpriseId; + } + + public void setArea5JoinByEnterpriseId(String area5JoinByEnterpriseId) { + this.area5JoinByEnterpriseId = area5JoinByEnterpriseId; + } + + public String getAddressJoinByEnterpriseId() { + return addressJoinByEnterpriseId; + } + + public void setAddressJoinByEnterpriseId(String addressJoinByEnterpriseId) { + this.addressJoinByEnterpriseId = addressJoinByEnterpriseId; + } + + public String getIndustryJoinByEnterpriseId() { + return industryJoinByEnterpriseId; + } + + public void setIndustryJoinByEnterpriseId(String industryJoinByEnterpriseId) { + this.industryJoinByEnterpriseId = industryJoinByEnterpriseId; + } + + public String getIndustryDictionaryName() { + return industryDictionaryName; + } + + public void setIndustryDictionaryName(String industryDictionaryName) { + this.industryDictionaryName = industryDictionaryName; + } + + public String getEngagedCountJoinByEnterpriseId() { + return engagedCountJoinByEnterpriseId; + } + + public void setEngagedCountJoinByEnterpriseId(String engagedCountJoinByEnterpriseId) { + this.engagedCountJoinByEnterpriseId = engagedCountJoinByEnterpriseId; + } + + public String getRiskOperationJoinByEnterpriseId() { + return riskOperationJoinByEnterpriseId; + } + + public void setRiskOperationJoinByEnterpriseId(String riskOperationJoinByEnterpriseId) { + this.riskOperationJoinByEnterpriseId = riskOperationJoinByEnterpriseId; + } + + public String getRiskOperationDictionaryName() { + return riskOperationDictionaryName; + } + + public void setRiskOperationDictionaryName(String riskOperationDictionaryName) { + this.riskOperationDictionaryName = riskOperationDictionaryName; + } + + public String getMasterJoinByEnterpriseId() { + return masterJoinByEnterpriseId; + } + + public void setMasterJoinByEnterpriseId(String masterJoinByEnterpriseId) { + this.masterJoinByEnterpriseId = masterJoinByEnterpriseId; + } + + public String getPhoneJoinByEnterpriseId() { + return phoneJoinByEnterpriseId; + } + + public void setPhoneJoinByEnterpriseId(String phoneJoinByEnterpriseId) { + this.phoneJoinByEnterpriseId = phoneJoinByEnterpriseId; + } + + public int getCheckType() { + return checkType; + } + + public void setCheckType(int checkType) { + this.checkType = checkType; + } + + public int getIsCoordination() { + return isCoordination; + } + + public void setIsCoordination(int isCoordination) { + this.isCoordination = isCoordination; + } + + public int getIsComplete() { + return isComplete; + } + + public void setIsComplete(int isComplete) { + this.isComplete = isComplete; + } + + public int getRectificationType() { + return rectificationType; + } + + public void setRectificationType(int rectificationType) { + this.rectificationType = rectificationType; + } + + public int getImmediatelyChangeType() { + return immediatelyChangeType; + } + + public void setImmediatelyChangeType(int immediatelyChangeType) { + this.immediatelyChangeType = immediatelyChangeType; + } + + public int getRectificationDays() { + return rectificationDays; + } + + public void setRectificationDays(int rectificationDays) { + this.rectificationDays = rectificationDays; + } + + public String getScenePhotos() { + return scenePhotos; + } + + public void setScenePhotos(String scenePhotos) { + this.scenePhotos = scenePhotos; + } + + public String getSummary() { + return summary; + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public String getCheckLng() { + return checkLng; + } + + public void setCheckLng(String checkLng) { + this.checkLng = checkLng; + } + + public String getCheckLat() { + return checkLat; + } + + public void setCheckLat(String checkLat) { + this.checkLat = checkLat; + } + + public String getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public List getCheckItems() { + return checkItems; + } + + public void setCheckItems(List checkItems) { + this.checkItems = checkItems; + } + + public static class CheckItemsBean { + /** + * checkItemId : bde68ea3-a271-42c2-bdcd-8f9a7e43f837 + * name : 培训制度 + * parentName : + * summary : 培训制度 + * type : 2 + * checkItemParentId : + * checkItemOptions : [] + * hiddenDangerReports : [{"hiddenDangerReportId":"56157962-0841-4a92-8b0c-ff0706780b49","checkId":"5f713cc6-bea8-4e32-bd63-39d82bae4e94","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","type":2,"checkItemType":1,"checkResult":"714cb2b5-9443-41fe-a565-ed28f9211268","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"9aa9f5c5-573b-4e0d-9efb-448194f1078e","checkId":"3765ecc0-2873-41b1-8d11-65642478a0a0","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","type":2,"checkItemType":1,"checkResult":"714cb2b5-9443-41fe-a565-ed28f9211268","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"1b0e2462-9513-44c5-ade1-85e0d5c6bfbf","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","type":2,"checkItemType":1,"checkResult":"714cb2b5-9443-41fe-a565-ed28f9211268","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"f4771d29-7eca-4313-8575-951b0057cafc","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","type":2,"checkItemType":1,"checkResult":"714cb2b5-9443-41fe-a565-ed28f9211268","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"39bc63c3-994c-43a5-bca4-548792f2d119","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","type":2,"checkItemType":1,"checkResult":"714cb2b5-9443-41fe-a565-ed28f9211268","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"619602ef-2b88-484d-8bd1-fc1e2b2fe848","checkId":"3ece2bbd-a540-4c84-b14d-0d17525d37dc","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"714cb2b5-9443-41fe-a565-ed28f9211268","type":2,"checkItemType":1,"checkResult":"714cb2b5-9443-41fe-a565-ed28f9211268","nameJoinByCheckItemId":"有","isWrongJoinByCheckItemId":0,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"e462d0f6-f304-4b45-a250-7c02cdbd118b","checkId":"76f8455c-14e3-430b-94bb-9bd2ecccfdc7","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"20515bae-5bfb-404a-8317-df3e3feb44e8","type":2,"checkItemType":1,"checkResult":"20515bae-5bfb-404a-8317-df3e3feb44e8","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"3124f163-00c3-4252-b993-bd94fe7a1aca","checkId":"5e7aab9a-0212-4c3d-ad37-4fe79e845f65","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"20515bae-5bfb-404a-8317-df3e3feb44e8","type":2,"checkItemType":1,"checkResult":"20515bae-5bfb-404a-8317-df3e3feb44e8","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""},{"hiddenDangerReportId":"97e80f63-5d05-4c2d-ac1a-23368413a29f","checkId":"e19a6490-54ea-4dce-b92a-66a14f3b06e4","checkItemId":"bde68ea3-a271-42c2-bdcd-8f9a7e43f837","checkItemOptionId":"20515bae-5bfb-404a-8317-df3e3feb44e8","type":2,"checkItemType":1,"checkResult":"20515bae-5bfb-404a-8317-df3e3feb44e8","nameJoinByCheckItemId":"无","isWrongJoinByCheckItemId":1,"unitJoinByCheckItemId":""}] + */ + + private String checkItemId; + private String name; + private String parentName; + private String summary; + private int type; + private String checkItemParentId; + private List checkItemOptions; + private List hiddenDangerReports; + + public String getCheckItemId() { + return checkItemId; + } + + public void setCheckItemId(String checkItemId) { + this.checkItemId = checkItemId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getParentName() { + return parentName; + } + + public void setParentName(String parentName) { + this.parentName = parentName; + } + + public String getSummary() { + return summary; + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public String getCheckItemParentId() { + return checkItemParentId; + } + + public void setCheckItemParentId(String checkItemParentId) { + this.checkItemParentId = checkItemParentId; + } + + public List getCheckItemOptions() { + return checkItemOptions; + } + + public void setCheckItemOptions(List checkItemOptions) { + this.checkItemOptions = checkItemOptions; + } + + public List getHiddenDangerReports() { + return hiddenDangerReports; + } + + public void setHiddenDangerReports(List hiddenDangerReports) { + this.hiddenDangerReports = hiddenDangerReports; + } + + public static class HiddenDangerReportsBean { + /** + * hiddenDangerReportId : 56157962-0841-4a92-8b0c-ff0706780b49 + * checkId : 5f713cc6-bea8-4e32-bd63-39d82bae4e94 + * checkItemId : bde68ea3-a271-42c2-bdcd-8f9a7e43f837 + * checkItemOptionId : 714cb2b5-9443-41fe-a565-ed28f9211268 + * type : 2 + * checkItemType : 1 + * checkResult : 714cb2b5-9443-41fe-a565-ed28f9211268 + * nameJoinByCheckItemId : 有 + * isWrongJoinByCheckItemId : 0 + * unitJoinByCheckItemId : + */ + + private String hiddenDangerReportId; + private String checkId; + private String checkItemId; + private String checkItemOptionId; + private int type; + private int checkItemType; + private String checkResult; + private String nameJoinByCheckItemId; + private int isWrongJoinByCheckItemId; + private String unitJoinByCheckItemId; + + public String getHiddenDangerReportId() { + return hiddenDangerReportId; + } + + public void setHiddenDangerReportId(String hiddenDangerReportId) { + this.hiddenDangerReportId = hiddenDangerReportId; + } + + public String getCheckId() { + return checkId; + } + + public void setCheckId(String checkId) { + this.checkId = checkId; + } + + public String getCheckItemId() { + return checkItemId; + } + + public void setCheckItemId(String checkItemId) { + this.checkItemId = checkItemId; + } + + public String getCheckItemOptionId() { + return checkItemOptionId; + } + + public void setCheckItemOptionId(String checkItemOptionId) { + this.checkItemOptionId = checkItemOptionId; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public int getCheckItemType() { + return checkItemType; + } + + public void setCheckItemType(int checkItemType) { + this.checkItemType = checkItemType; + } + + public String getCheckResult() { + return checkResult; + } + + public void setCheckResult(String checkResult) { + this.checkResult = checkResult; + } + + public String getNameJoinByCheckItemId() { + return nameJoinByCheckItemId; + } + + public void setNameJoinByCheckItemId(String nameJoinByCheckItemId) { + this.nameJoinByCheckItemId = nameJoinByCheckItemId; + } + + public int getIsWrongJoinByCheckItemId() { + return isWrongJoinByCheckItemId; + } + + public void setIsWrongJoinByCheckItemId(int isWrongJoinByCheckItemId) { + this.isWrongJoinByCheckItemId = isWrongJoinByCheckItemId; + } + + public String getUnitJoinByCheckItemId() { + return unitJoinByCheckItemId; + } + + public void setUnitJoinByCheckItemId(String unitJoinByCheckItemId) { + this.unitJoinByCheckItemId = unitJoinByCheckItemId; + } + } + } +} diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/OptionsSubmitBean.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/OptionsSubmitBean.java index 44ad691..429bcc4 100644 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/OptionsSubmitBean.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/OptionsSubmitBean.java @@ -10,20 +10,58 @@ import java.util.List; */ public class OptionsSubmitBean { + /** + * checkResult : 0 * checkType : 0 * enterpriseId : string - * hiddenDangerReports : [{"checkId":"string","checkItemId":"string","checkResult":0,"immediatelyChangeType":0,"rectificationDays":0,"rectificationType":0,"scenePhotos":"string","summary":"string"}] + * hiddenDangerReports : [{"checkId":"string","checkItemId":"string","checkItemOptionId":"string","checkResult":"string","type":0}] + * immediatelyChangeType : 0 * isComplete : 0 * isCoordination : 0 + * rectificationDays : 0 + * rectificationType : 0 + * scenePhotos : string + * summary : string */ - - private int checkType;// 1检查 复查 - private String enterpriseId; //企业Id - private int isComplete;// - private int isCoordination;//是否配合 + private String checkLat; + private String checkLng; + private int checkResult; + private int checkType; + private String enterpriseId; + private int immediatelyChangeType; + private int isComplete; + private int isCoordination; + private int rectificationDays; + private int rectificationType; + private String scenePhotos; + private String summary; private List hiddenDangerReports; + public String getCheckLat() { + return checkLat; + } + + public void setCheckLat(String checkLat) { + this.checkLat = checkLat; + } + + public String getCheckLng() { + return checkLng; + } + + public void setCheckLng(String checkLng) { + this.checkLng = checkLng; + } + + public int getCheckResult() { + return checkResult; + } + + public void setCheckResult(int checkResult) { + this.checkResult = checkResult; + } + public int getCheckType() { return checkType; } @@ -40,6 +78,14 @@ public class OptionsSubmitBean { this.enterpriseId = enterpriseId; } + public int getImmediatelyChangeType() { + return immediatelyChangeType; + } + + public void setImmediatelyChangeType(int immediatelyChangeType) { + this.immediatelyChangeType = immediatelyChangeType; + } + public int getIsComplete() { return isComplete; } @@ -56,6 +102,38 @@ public class OptionsSubmitBean { this.isCoordination = isCoordination; } + public int getRectificationDays() { + return rectificationDays; + } + + public void setRectificationDays(int rectificationDays) { + this.rectificationDays = rectificationDays; + } + + public int getRectificationType() { + return rectificationType; + } + + public void setRectificationType(int rectificationType) { + this.rectificationType = rectificationType; + } + + public String getScenePhotos() { + return scenePhotos; + } + + public void setScenePhotos(String scenePhotos) { + this.scenePhotos = scenePhotos; + } + + public String getSummary() { + return summary; + } + + public void setSummary(String summary) { + this.summary = summary; + } + public List getHiddenDangerReports() { return hiddenDangerReports; } @@ -68,22 +146,16 @@ public class OptionsSubmitBean { /** * checkId : string * checkItemId : string - * checkResult : 0 - * immediatelyChangeType : 0 - * rectificationDays : 0 - * rectificationType : 0 - * scenePhotos : string - * summary : string + * checkItemOptionId : string + * checkResult : string + * type : 0 */ private String checkId; private String checkItemId; - private int checkResult; - private int immediatelyChangeType; - private int rectificationDays; - private int rectificationType; - private String scenePhotos; - private String summary; + private String checkItemOptionId; + private String checkResult; + private int type; public String getCheckId() { return checkId; @@ -101,52 +173,28 @@ public class OptionsSubmitBean { this.checkItemId = checkItemId; } - public int getCheckResult() { + public String getCheckItemOptionId() { + return checkItemOptionId; + } + + public void setCheckItemOptionId(String checkItemOptionId) { + this.checkItemOptionId = checkItemOptionId; + } + + public String getCheckResult() { return checkResult; } - public void setCheckResult(int checkResult) { + public void setCheckResult(String checkResult) { this.checkResult = checkResult; } - public int getImmediatelyChangeType() { - return immediatelyChangeType; + public int getType() { + return type; } - public void setImmediatelyChangeType(int immediatelyChangeType) { - this.immediatelyChangeType = immediatelyChangeType; - } - - public int getRectificationDays() { - return rectificationDays; - } - - public void setRectificationDays(int rectificationDays) { - this.rectificationDays = rectificationDays; - } - - public int getRectificationType() { - return rectificationType; - } - - public void setRectificationType(int rectificationType) { - this.rectificationType = rectificationType; - } - - public String getScenePhotos() { - return scenePhotos; - } - - public void setScenePhotos(String scenePhotos) { - this.scenePhotos = scenePhotos; - } - - public String getSummary() { - return summary; - } - - public void setSummary(String summary) { - this.summary = summary; + public void setType(int type) { + this.type = type; } } } diff --git a/app/src/main/java/com/sucstepsoft/txrealtimelocation/net/LocationApiService.java b/app/src/main/java/com/sucstepsoft/txrealtimelocation/net/LocationApiService.java index b7fc975..5fde424 100755 --- a/app/src/main/java/com/sucstepsoft/txrealtimelocation/net/LocationApiService.java +++ b/app/src/main/java/com/sucstepsoft/txrealtimelocation/net/LocationApiService.java @@ -5,6 +5,7 @@ import com.sucstepsoft.txrealtimelocation.beans.AddressListBean; import com.sucstepsoft.txrealtimelocation.beans.AreaListBean; import com.sucstepsoft.txrealtimelocation.beans.BaseUserBean; import com.sucstepsoft.txrealtimelocation.beans.CaseFlowBean; +import com.sucstepsoft.txrealtimelocation.beans.CheckItemOption; import com.sucstepsoft.txrealtimelocation.beans.CheckOptionsbean; import com.sucstepsoft.txrealtimelocation.beans.CheckSignBean; import com.sucstepsoft.txrealtimelocation.beans.CheckSignOffBean; @@ -15,6 +16,7 @@ import com.sucstepsoft.txrealtimelocation.beans.CounterCheckListBean; import com.sucstepsoft.txrealtimelocation.beans.CounterCheckOptionsBean; import com.sucstepsoft.txrealtimelocation.beans.DepartmentBean; import com.sucstepsoft.txrealtimelocation.beans.DictBean; +import com.sucstepsoft.txrealtimelocation.beans.HistoryDetialBean; import com.sucstepsoft.txrealtimelocation.beans.HistoryMissionBean; import com.sucstepsoft.txrealtimelocation.beans.IssueSubBean; import com.sucstepsoft.txrealtimelocation.beans.LeaveDetailBean; @@ -629,7 +631,13 @@ public interface LocationApiService { //industrycheckitem/listindustrycheckitem/{id} @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @GET("industrycheckitem/listindustrycheckitem") - Observable> getCheckOptionsList(@Query("industryId") String id, @Header("token") String token); + Observable> getCheckOptionsList(@Query("industryId") String id, @Query("natureId") String nId, @Header("token") String token); + + //获取检查项 + //GET /app/checkitemoption/listcheckitemoption + @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) + @GET("checkitemoption/listcheckitemoption") + Observable> getCheckItemOptionList(@Query("industryId") String id, @Header("token") String token); //保存检查结果 @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @@ -708,6 +716,11 @@ public interface LocationApiService { @GET("check/listcheckitembycheckid/{checkId}") Observable> getHistoryDetail(@Path("checkId") String checkId, @Header("token") String token); + //历史任务详情 --- 新接口 + @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) + @GET("check/getcheckbyid/{checkId}") + Observable getHistoryDetailById(@Path("checkId") String checkId, @Header("token") String token); + //通知列表 @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @GET("articlecontent/listpagearticlecontent") diff --git a/app/src/main/res/layout/activity_company_detail.xml b/app/src/main/res/layout/activity_company_detail.xml index 58d1267..f7fcbfe 100644 --- a/app/src/main/res/layout/activity_company_detail.xml +++ b/app/src/main/res/layout/activity_company_detail.xml @@ -288,7 +288,7 @@ + android:text="生产单位经营外貌" /> diff --git a/app/src/main/res/layout/activity_counter_check_options.xml b/app/src/main/res/layout/activity_counter_check_options.xml index 474588d..21deec8 100644 --- a/app/src/main/res/layout/activity_counter_check_options.xml +++ b/app/src/main/res/layout/activity_counter_check_options.xml @@ -61,7 +61,7 @@ android:layout_width="wrap_content" android:layout_height="27dp" android:background="@drawable/sp_blue_sel" - android:text="企业不配合" + android:text="企业未整改" android:textColor="@color/titleBar" /> @@ -86,10 +86,103 @@ + android:layout_height="wrap_content" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_enter_company_info.xml b/app/src/main/res/layout/activity_enter_company_info.xml index 21dfa3e..f0d0786 100644 --- a/app/src/main/res/layout/activity_enter_company_info.xml +++ b/app/src/main/res/layout/activity_enter_company_info.xml @@ -98,6 +98,7 @@ diff --git a/app/src/main/res/layout/activity_history_detial.xml b/app/src/main/res/layout/activity_history_detial.xml index 7528f58..4066c26 100644 --- a/app/src/main/res/layout/activity_history_detial.xml +++ b/app/src/main/res/layout/activity_history_detial.xml @@ -9,8 +9,88 @@ android:padding="10dp" tools:context=".activitys.issue.HistoryDetialActivity"> - + android:layout_height="wrap_content" + android:scrollbars="none"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_new_check_options.xml b/app/src/main/res/layout/activity_new_check_options.xml new file mode 100644 index 0000000..0ab5497 --- /dev/null +++ b/app/src/main/res/layout/activity_new_check_options.xml @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + +