gaojian/app_btyjgrid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

第一版

Browse Source
This commit is contained in:
itgaojian163 2020-04-09 19:08:19 +08:00
parent 9441797236
commit 86f0267e38
77 changed files with 2438 additions and 1155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/release/output.json
View File

@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.0.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
[{"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":{}}]

BIN
app/release/yj-zs-1.apk Normal file
View File

Binary file not shown.

37
app/src/main/AndroidManifest.xml
View File

@ -47,12 +47,32 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name=".activitys.issue.HistoryDetialActivity"></activity>
<activity android:name=".activitys.countercheck.CounterCheckOptionsActivity" />
<activity android:name=".activitys.countercheck.CounterCheckMainActivity" />
<activity android:name=".activitys.issue.HistoryListActivity" />
<activity android:name=".activitys.mine.MineMissionActivity" />
<activity android:name=".activitys.companylib.MineCompanyLibActivity" />
<activity android:name=".activitys.issue.PublicReportActivity"></activity>
<activity android:name=".activitys.issue.PublicAreaActivity" />
<activity
android:name=".activitys.issue.HistoryDetialActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
<activity
android:name=".activitys.countercheck.CounterCheckOptionsActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
<activity
android:name=".activitys.countercheck.CounterCheckMainActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
<activity
android:name=".activitys.issue.HistoryListActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
<activity
android:name=".activitys.mine.MineMissionActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
<activity
android:name=".activitys.companylib.MineCompanyLibActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
<activity
android:name=".activitys.lawlib.LawLibActivity"
android:screenOrientation="portrait" />
@ -196,7 +216,10 @@
<category android:name="jpush.testCategory" />
</intent-filter>
</activity> <!-- ====百度地图=== -->
<activity android:name=".activitys.common.PhotoActivity" /> <!-- ============== -->
<activity
android:name=".activitys.common.PhotoActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" /> <!-- ============== -->
<!-- <activity -->
<!-- android:name="cn.jpush.android.ui.PopWinActivity" -->
<!-- android:exported="false" -->

22
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/MainActivity.java
View File

@ -30,7 +30,9 @@ import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.sucstepsoft.txrealtimelocation.R;
import com.sucstepsoft.txrealtimelocation.activitys.companylib.MineCompanyLibActivity;
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.PublicAreaActivity;
import com.sucstepsoft.txrealtimelocation.activitys.lawlib.LawLibActivity;
import com.sucstepsoft.txrealtimelocation.activitys.companylib.CompanyLibActivity;
import com.sucstepsoft.txrealtimelocation.activitys.issue.CheckOptionsActivity;
@ -91,6 +93,8 @@ public class MainActivity extends BaseActivity {
TextView mTvRule;
@BindView(R.id.tv_online)
TextView mTvOnline;
@BindView(R.id.ll_history)
LinearLayout mllHistory;
private String[] permissions = new String[]{
PermissionConstants.STORAGE,
PermissionConstants.PHONE,
@ -98,11 +102,12 @@ public class MainActivity extends BaseActivity {
};
private Unbinder mBind;
private List<FuncBean> mFuncs = new ArrayList<>();
private String[] mBtnStrs = new String[]{"企业信息", "隐患上报", "隐患复查", "我的任务", "历史任务", "法律法规"};
private int[] mBtnIds = new int[]{R.drawable.ic_company, R.drawable.ic_trouble,R.drawable.ic_fucha,
R.drawable.ic_law,
R.drawable.ic_trouble,
R.drawable.ic_law};
private String[] mBtnStrs = new String[]{"企业信息", "隐患上报", "隐患复查", "我的任务", "公共区域", "法律法规"};
// private String[] mBtnStrs = new String[]{"企业信息", "隐患上报", "隐患复查", "我的任务", "历史任务", "法律法规"};
private int[] mBtnIds = new int[]{R.drawable.ic_main_c_info, R.drawable.ic_main_report, R.drawable.ic_main_risk,
R.drawable.ic_main_mine,
R.drawable.ic_main_history,
R.drawable.ic_main_law};
private Gson mGson = null;
private AlertDialog mGpsWeakDialog;
@ -175,6 +180,9 @@ public class MainActivity extends BaseActivity {
case "历史任务":
intent = new Intent(this, HistoryListActivity.class);
break;
case "公共区域":
intent = new Intent(this, PublicAreaActivity.class);
break;
}
startActivity(intent);
}
@ -294,6 +302,7 @@ public class MainActivity extends BaseActivity {
*/
@OnClick({
R.id.ll_mine_issue,
R.id.ll_history,
R.id.tv_sign,
R.id.tv_rule,
R.id.ll_user_center,
@ -318,6 +327,9 @@ public class MainActivity extends BaseActivity {
break;
case R.id.tv_rule://签到规则
break;
case R.id.ll_history://历史任务
startActivity(new Intent(MainActivity.this, HistoryListActivity.class));
break;
}
}

18
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/companylib/CompanyDetailActivity.java
View File

@ -6,6 +6,7 @@ import android.support.v7.widget.GridLayoutManager;
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;
@ -65,6 +66,16 @@ public class CompanyDetailActivity extends BaseActivity {
RecyclerView mRlvDoor;
@BindView(R.id.rlv_place)
RecyclerView mRlvPlace;
@BindView(R.id.tv_com_p)
TextView mTvComP;
@BindView(R.id.tv_scope)
TextView mTvScope;
@BindView(R.id.tv_code)
TextView mTvCode;
@BindView(R.id.tv_trade_1)
TextView mTvTrade1;
@BindView(R.id.ll_company_info)
LinearLayout mLlCompanyInfo;
private Unbinder mBind;
private CompanyDetailBean mDetailBean;
private String mId;
@ -88,7 +99,6 @@ public class CompanyDetailActivity extends BaseActivity {
startActivity(intent);
});
mId = getIntent().getStringExtra("id");
getCompanyDetailById(mId);
}
@Override
@ -137,9 +147,14 @@ public class CompanyDetailActivity extends BaseActivity {
mTvArea3.setText(mDetailBean.getArea3DictionaryName());
mTvArea4.setText(mDetailBean.getArea4DictionaryName());
mTvArea5.setText(mDetailBean.getArea5DictionaryName());
mTvType.setText(mDetailBean.getTypeDictionaryName());
mTvName.setText(mDetailBean.getName());
mTvPeo.setText(mDetailBean.getMaster());
mTvPhone.setText(mDetailBean.getPhone());
mTvComP.setText(mDetailBean.getLegalPerson());
mTvScope.setText(mDetailBean.getSummary());
mTvCode.setText(mDetailBean.getBussinessRegNum());
mTvTrade1.setText(mDetailBean.getIndustryTypeDictionaryName());
mTvDetAddress.setText(mDetailBean.getAddress());
mTvPeoCount.setText(mDetailBean.getEngagedCount() + "人");
mTvRisk.setText(mDetailBean.getRiskOperationDictionaryName());
@ -199,4 +214,5 @@ public class CompanyDetailActivity extends BaseActivity {
mBind.unbind();
mDetailDis.dispose();
}
}

139
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/companylib/CompanyInfoEditActivity.java
View File

@ -6,14 +6,14 @@ import android.database.Cursor;
import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.provider.CallLog;
import android.os.Bundle;
import android.provider.MediaStore;
import android.support.v4.content.FileProvider;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.Gravity;
import android.widget.Button;
import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
@ -22,7 +22,6 @@ import com.bigkoo.pickerview.view.OptionsPickerView;
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.beans.DictionaryBean;
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;
@ -41,7 +40,6 @@ import com.sucstepsoft.txrealtimelocation.beans.CompanyDetailBean;
import com.sucstepsoft.txrealtimelocation.beans.CompanyEnterBean;
import com.sucstepsoft.txrealtimelocation.beans.DictBean;
import com.sucstepsoft.txrealtimelocation.beans.SuccessBean;
import com.sucstepsoft.txrealtimelocation.beans.TypeListBean;
import com.sucstepsoft.txrealtimelocation.net.LocationApiService;
import java.io.File;
@ -66,6 +64,12 @@ import top.zibin.luban.OnCompressListener;
*/
public class CompanyInfoEditActivity extends BaseActivity {
@BindView(R.id.et_company_p)
EditText mEtCompanyP;
@BindView(R.id.et_company_code)
EditText mEtCompanyCode;
@BindView(R.id.et_company_scope)
EditText mEtCompanyScope;
private Unbinder mBind;
private String mId;
private CompanyDetailBean mDetailBean;
@ -94,8 +98,6 @@ public class CompanyInfoEditActivity extends BaseActivity {
RecyclerView mRlvDoor;
@BindView(R.id.rlv_place)
RecyclerView mRlvPlace;
@BindView(R.id.btn_submit)
Button mBtnSubmit;
@BindView(R.id.tv_qixian)
TextView mTvArea3;
@BindView(R.id.tv_street)
@ -106,6 +108,8 @@ public class CompanyInfoEditActivity extends BaseActivity {
TextView mTvArea1;
@BindView(R.id.tv_shi)
TextView mTvArea2;
@BindView(R.id.tv_trade_1)
TextView mTvTrade1;
private List<AddPhotoBean> mDoorPhotos;
private List<AddPhotoBean> mPlacePhotos;
@ -113,8 +117,9 @@ public class CompanyInfoEditActivity extends BaseActivity {
private String mPicPath;
private String mDoorPhotoIds = "";
private String mPlacePhotoIds = "";
private OptionsPickerView mTypePicker;//单位类型
private OptionsPickerView mTradePicker;//管理行业
private OptionsPickerView mTradePicker1;//管理行业
private OptionsPickerView mMArea1Picker;
private OptionsPickerView mMArea2Picker;
private OptionsPickerView mMArea3Picker;
@ -123,8 +128,10 @@ public class CompanyInfoEditActivity extends BaseActivity {
private OptionsPickerView mCountyPicker;//旗县
private OptionsPickerView mStreetPicker;//街道
private OptionsPickerView mTraitPicker;//风险特点
private OptionsPickerView mTypePicker;//单位类型
private List<DictBean> mTypeList = null;//单位类型
private List<DictBean> mTradeList = null;//管理行业
private List<DictBean> mTradeList1 = null;//管理行业1
private List<DictBean> mArea1List = null;//省
private List<DictBean> mArea2List = null;//市
private List<DictBean> mArea3List = null;//旗县
@ -133,6 +140,10 @@ public class CompanyInfoEditActivity extends BaseActivity {
private List<DictBean> mTraitList = null;//风险特点
private String mSelTypeId = "";//单位类型ID
private String mSelTradeId = "";//管理行业ID
private String code = "";//组织机构代码证
private String companP = "";//企业法人
private String scope = "";//营业范围
private String mSelTrade1 = "";//行业
private String mSelArea1Id = "";//省
private String mSelArea2Id = "";//市
@ -142,7 +153,6 @@ public class CompanyInfoEditActivity extends BaseActivity {
private String mTraitId = "";//风险特点ID
private String companyName = "";//企业名称
private String regisAddress = "";//注册地址
private String detailAddress = "";//详细地址
private String praceNum = "";//从业人员数量
private String people = "";//主要负责人
@ -151,6 +161,7 @@ public class CompanyInfoEditActivity extends BaseActivity {
private AddPhotoAdapter mMPlacePhotoAdapter;
private AddPhotoAdapter mMDoorPhotoAdapter;
@Override
protected int setLayoutId() {
return R.layout.activity_company_info_edit;
@ -164,7 +175,9 @@ public class CompanyInfoEditActivity extends BaseActivity {
mId = getIntent().getStringExtra("id");
getCompanyDetail(mId);
initPhotoView();
mBtnSubmit.setOnClickListener(v -> doSubmit());
mTvPublish.setVisibility(View.VISIBLE);
mTvPublish.setText("保存");
mTvPublish.setOnClickListener(v -> doSubmit());
}
private void initPhotoView() {
@ -227,6 +240,30 @@ public class CompanyInfoEditActivity extends BaseActivity {
mTvArea5.setOnClickListener(v -> onShowArea5Picker());
mTvRisk.setOnClickListener(v -> onShowRiskPicker());
mTvTrade.setOnClickListener(v -> onShowTradePicker());
mTvTrade1.setOnClickListener(v -> onShowTrade1Picker());
}
private void onShowTrade1Picker() {
hideSoftKeyboard();
if (mTradeList1 != null && mTradeList1.size() > 0) {
mTradePicker1 = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> {
DictBean bean = mTradeList1.get(options1);
mSelTrade1 = bean.getDictionaryId();
mTvTrade1.setText(bean.getDictionaryName());
}).setTitleText("请选择")
.setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF"))
.setTitleColor(Color.parseColor("#1189FF"))
.build();
mTradePicker1.setPicker(mTradeList1);
mTradePicker1.show();
} else {
if (mTradeList1 == null) {
getDicList(PathConfig.DIC_TRADE_ID, 9);
} else {
ToastUtils.showShort("暂无数据");
}
}
}
private void getCompanyDetail(String id) {
@ -321,25 +358,29 @@ public class CompanyInfoEditActivity extends BaseActivity {
private void onShowTradePicker() {
hideSoftKeyboard();
if (mTradeList != null && mTradeList.size() > 0) {
mTradePicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> {
DictBean bean = mTradeList.get(options1);
mSelTradeId = bean.getDictionaryId();
mTvTrade.setText(bean.getDictionaryName());
}).setTitleText("请选择")
.setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF"))
.setTitleColor(Color.parseColor("#1189FF"))
.build();
mTradePicker.setPicker(mTradeList);
mTradePicker.show();
if (TextUtils.isEmpty(mSelTrade1)) {
ToastUtils.showShort("请先选择行业类型");
} else {
if (mTradeList == null) {
getDicList(PathConfig.DIC_TRADE_ID, 7);
if (mTradeList != null && mTradeList.size() > 0) {
mTradePicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> {
DictBean bean = mTradeList.get(options1);
mSelTradeId = bean.getDictionaryId();
mTvTrade.setText(bean.getDictionaryName());
}).setTitleText("请选择")
.setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF"))
.setTitleColor(Color.parseColor("#1189FF"))
.build();
mTradePicker.setPicker(mTradeList);
mTradePicker.show();
} else {
ToastUtils.showShort("暂无数据");
}
if (mTradeList == null) {
getDicList(mSelTrade1, 7);
} else {
ToastUtils.showShort("暂无数据");
}
}
}
}
@ -448,12 +489,23 @@ public class CompanyInfoEditActivity extends BaseActivity {
submitBean.setEngagedCount(Integer.parseInt(praceNum));//从业人数
submitBean.setPhone(phone);//电话
submitBean.setRiskOperation(mTraitId);//风险
submitBean.setIndustry(mSelTradeId);//行业
submitBean.setFactoryGate(mDoorPhotoIds);
submitBean.setWorkplace(mPlacePhotoIds);
submitBean.setArea1(mSelArea1Id);
submitBean.setArea2(mSelArea2Id);
submitBean.setArea3(mSelArea3Id);
submitBean.setIndustryType(mSelTrade1);
submitBean.setBussinessRegNum(code);
submitBean.setLegalPerson(companP);
submitBean.setSummary(scope);
if (!TextUtils.isEmpty(mSelTradeId)) {
submitBean.setIndustry(mSelTradeId);//行业
}
if (!TextUtils.isEmpty(mSelArea4Id)) {
submitBean.setArea4(mSelArea4Id);
}
@ -501,6 +553,21 @@ public class CompanyInfoEditActivity extends BaseActivity {
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("请输入营业范围");
return false;
}
companP = mEtCompanyP.getText().toString().trim();
if (TextUtils.isEmpty(companP)) {
ToastUtils.showShort("请输入企业法人");
return false;
}
detailAddress = mEtDetailAddress.getText().toString().trim();
if (TextUtils.isEmpty(detailAddress)) {
ToastUtils.showShort("请输入企业详细地址");
@ -525,7 +592,7 @@ public class CompanyInfoEditActivity extends BaseActivity {
ToastUtils.showShort("请选择企业类型");
return false;
}
if (TextUtils.isEmpty(mSelTradeId)) {
if (TextUtils.isEmpty(mSelTrade1)) {
ToastUtils.showShort("请选择企业所属行业");
return false;
}
@ -609,6 +676,10 @@ public class CompanyInfoEditActivity extends BaseActivity {
mTraitList = dictBeans;
onShowRiskPicker();
break;
case 9://管理行业一级
mTradeList1 = dictBeans;
onShowTrade1Picker();
break;
}
}
@ -925,6 +996,19 @@ public class CompanyInfoEditActivity extends BaseActivity {
mSelTradeId = mDetailBean.getIndustry();
mTvTrade.setText(mDetailBean.getIndustryDictionaryName());
scope = mDetailBean.getSummary();
mEtCompanyScope.setText(scope);
code = mDetailBean.getBussinessRegNum();
mEtCompanyCode.setText(code);
companP = mDetailBean.getLegalPerson();
mEtCompanyP.setText(companP);
mTvTrade1.setText(mDetailBean.getIndustryTypeDictionaryName());
mSelTrade1 = mDetailBean.getIndustryType();
mDoorPhotos = new ArrayList<>();
mPlacePhotos = new ArrayList<>();
mDoorPhotos.add(new AddPhotoBean());
@ -970,4 +1054,5 @@ public class CompanyInfoEditActivity extends BaseActivity {
super.onDestroy();
mBind.unbind();
}
}

6
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/companylib/CompanyLibActivity.java
View File

@ -69,8 +69,8 @@ public class CompanyLibActivity extends BaseActivity {
TextView mTvErrorHint;
@BindView(R.id.btn_search)
Button mBtnSearch;
@BindView(R.id.btn_clear)
Button mBtnClear;
@BindView(R.id.iv_clear)
ImageView mIvClear;
private Unbinder mBind;
@BindView(R.id.xlv_com_lib)
XRecyclerView mRlvComList;
@ -144,7 +144,7 @@ public class CompanyLibActivity extends BaseActivity {
getCompanyLibList(mCurrentPage, false);
stateView(STATE_LOAD_LOADING);
mBtnSearch.setOnClickListener(v -> searchCompany());
mBtnClear.setOnClickListener(v -> {
mIvClear.setOnClickListener(v -> {
mCurrentPage = 1;
mCurrentType = 1;
mSearchCompanyName = "";

120
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/companylib/EnterCompanyInfoActivity.java
View File

@ -13,6 +13,7 @@ import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
@ -22,7 +23,6 @@ import com.bigkoo.pickerview.view.OptionsPickerView;
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.beans.DictionaryBean;
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;
@ -39,7 +39,6 @@ import com.sucstepsoft.txrealtimelocation.beans.BaseUserBean;
import com.sucstepsoft.txrealtimelocation.beans.CompanyEnterBean;
import com.sucstepsoft.txrealtimelocation.beans.DictBean;
import com.sucstepsoft.txrealtimelocation.beans.SuccessBean;
import com.sucstepsoft.txrealtimelocation.beans.TypeListBean;
import com.sucstepsoft.txrealtimelocation.net.LocationApiService;
import java.io.File;
@ -52,7 +51,6 @@ import butterknife.Unbinder;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.observers.TestObserver;
import io.reactivex.schedulers.Schedulers;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
@ -89,8 +87,6 @@ public class EnterCompanyInfoActivity extends BaseActivity {
RecyclerView mRlvDoor;
@BindView(R.id.rlv_place)
RecyclerView mRlvPlace;
@BindView(R.id.btn_submit)
Button mBtnSubmit;
@BindView(R.id.tv_qixian)
TextView mTvArea3;
@BindView(R.id.tv_street)
@ -101,6 +97,14 @@ public class EnterCompanyInfoActivity extends BaseActivity {
TextView mTvArea1;
@BindView(R.id.tv_shi)
TextView mTvArea2;
@BindView(R.id.et_company_p)
EditText mEtCompanyP;
@BindView(R.id.et_company_code)
EditText mEtCompanyCode;
@BindView(R.id.et_company_scope)
EditText mEtCompanyScope;
@BindView(R.id.tv_trade_1)
TextView mTvTrade1;
private Unbinder mBind;
private List<AddPhotoBean> mDoorPhotos;
@ -111,6 +115,7 @@ public class EnterCompanyInfoActivity extends BaseActivity {
private String mPlacePhotoIds = "";
private OptionsPickerView mTradePicker;//管理行业
private OptionsPickerView mTradePicker1;//管理行业
private OptionsPickerView mMArea1Picker;
private OptionsPickerView mMArea2Picker;
private OptionsPickerView mMArea3Picker;
@ -122,6 +127,7 @@ public class EnterCompanyInfoActivity extends BaseActivity {
private OptionsPickerView mTypePicker;//单位类型
private List<DictBean> mTypeList = null;//单位类型
private List<DictBean> mTradeList = null;//管理行业
private List<DictBean> mTradeList1 = null;//管理行业1
private List<DictBean> mArea1List = null;//省
private List<DictBean> mArea2List = null;//市
private List<DictBean> mArea3List = null;//旗县
@ -130,6 +136,10 @@ public class EnterCompanyInfoActivity extends BaseActivity {
private List<DictBean> mTraitList = null;//风险特点
private String mSelTypeId = "";//单位类型ID
private String mSelTradeId = "";//管理行业ID
private String code = "";//组织机构代码证
private String companP = "";//企业法人
private String scope = "";//营业范围
private String mSelTrade1 = "";//行业
private String mSelArea1Id = "";//省
private String mSelArea2Id = "";//市
@ -138,9 +148,7 @@ public class EnterCompanyInfoActivity extends BaseActivity {
private String mSelArea5Id = "";//村 社区
private String mTraitId = "";//风险特点ID
private String mTraitPId = "";//风险特点父ID
private String companyName = "";//企业名称
private String regisAddress = "";//注册地址
private String detailAddress = "";//详细地址
private String praceNum = "";//从业人员数量
private String people = "";//主要负责人
@ -160,8 +168,10 @@ public class EnterCompanyInfoActivity extends BaseActivity {
mTvBaseTitle.setText("企业信息录入");
refreshView(STATE_LOAD_SUCCESS);
mBind = ButterKnife.bind(this);
mTvPublish.setVisibility(View.VISIBLE);
mTvPublish.setText("保存");
mTvPublish.setOnClickListener(v -> doSubmit());
initPhotoView();
mBtnSubmit.setOnClickListener(v -> doSubmit());
}
private void initPhotoView() {
@ -224,6 +234,30 @@ public class EnterCompanyInfoActivity extends BaseActivity {
mTvArea5.setOnClickListener(v -> onShowArea5Picker());
mTvRisk.setOnClickListener(v -> onShowRiskPicker());
mTvTrade.setOnClickListener(v -> onShowTradePicker());
mTvTrade1.setOnClickListener(v -> onShowTrade1Picker());
}
private void onShowTrade1Picker() {
hideSoftKeyboard();
if (mTradeList1 != null && mTradeList1.size() > 0) {
mTradePicker1 = new OptionsPickerBuilder(EnterCompanyInfoActivity.this, (options1, options2, options3, v) -> {
DictBean bean = mTradeList1.get(options1);
mSelTrade1 = bean.getDictionaryId();
mTvTrade1.setText(bean.getDictionaryName());
}).setTitleText("请选择")
.setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF"))
.setTitleColor(Color.parseColor("#1189FF"))
.build();
mTradePicker1.setPicker(mTradeList1);
mTradePicker1.show();
} else {
if (mTradeList1 == null) {
getDicList(PathConfig.DIC_TRADE_ID, 9);
} else {
ToastUtils.showShort("暂无数据");
}
}
}
/**
@ -286,25 +320,29 @@ public class EnterCompanyInfoActivity extends BaseActivity {
private void onShowTradePicker() {
hideSoftKeyboard();
if (mTradeList != null && mTradeList.size() > 0) {
mTradePicker = new OptionsPickerBuilder(EnterCompanyInfoActivity.this, (options1, options2, options3, v) -> {
DictBean bean = mTradeList.get(options1);
mSelTradeId = bean.getDictionaryId();
mTvTrade.setText(bean.getDictionaryName());
}).setTitleText("请选择")
.setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF"))
.setTitleColor(Color.parseColor("#1189FF"))
.build();
mTradePicker.setPicker(mTradeList);
mTradePicker.show();
if (TextUtils.isEmpty(mSelTrade1)) {
ToastUtils.showShort("请先选择行业类型");
} else {
if (mTradeList == null) {
getDicList(PathConfig.DIC_TRADE_ID, 7);
if (mTradeList != null && mTradeList.size() > 0) {
mTradePicker = new OptionsPickerBuilder(EnterCompanyInfoActivity.this, (options1, options2, options3, v) -> {
DictBean bean = mTradeList.get(options1);
mSelTradeId = bean.getDictionaryId();
mTvTrade.setText(bean.getDictionaryName());
}).setTitleText("请选择")
.setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF"))
.setTitleColor(Color.parseColor("#1189FF"))
.build();
mTradePicker.setPicker(mTradeList);
mTradePicker.show();
} else {
ToastUtils.showShort("暂无数据");
}
if (mTradeList == null) {
getDicList(mSelTrade1, 7);
} else {
ToastUtils.showShort("暂无数据");
}
}
}
}
@ -413,12 +451,23 @@ public class EnterCompanyInfoActivity extends BaseActivity {
submitBean.setEngagedCount(Integer.parseInt(praceNum));//从业人数
submitBean.setPhone(phone);//电话
submitBean.setRiskOperation(mTraitId);//风险
submitBean.setIndustry(mSelTradeId);//行业
submitBean.setFactoryGate(mDoorPhotoIds);
submitBean.setWorkplace(mPlacePhotoIds);
submitBean.setArea1(mSelArea1Id);
submitBean.setArea2(mSelArea2Id);
submitBean.setArea3(mSelArea3Id);
submitBean.setIndustryType(mSelTrade1);
submitBean.setBussinessRegNum(code);
submitBean.setLegalPerson(companP);
submitBean.setSummary(scope);
if (!TextUtils.isEmpty(mSelTradeId)) {
submitBean.setIndustry(mSelTradeId);//行业
}
if (!TextUtils.isEmpty(mSelArea4Id)) {
submitBean.setArea4(mSelArea4Id);
}
@ -466,6 +515,21 @@ public class EnterCompanyInfoActivity extends BaseActivity {
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("请输入营业范围");
return false;
}
companP = mEtCompanyP.getText().toString().trim();
if (TextUtils.isEmpty(companP)) {
ToastUtils.showShort("请输入企业法人");
return false;
}
detailAddress = mEtDetailAddress.getText().toString().trim();
if (TextUtils.isEmpty(detailAddress)) {
ToastUtils.showShort("请输入企业详细地址");
@ -490,7 +554,7 @@ public class EnterCompanyInfoActivity extends BaseActivity {
ToastUtils.showShort("请选择企业类型");
return false;
}
if (TextUtils.isEmpty(mSelTradeId)) {
if (TextUtils.isEmpty(mSelTrade1)) {
ToastUtils.showShort("请选择企业所属行业");
return false;
}
@ -574,6 +638,10 @@ public class EnterCompanyInfoActivity extends BaseActivity {
mTraitList = dictBeans;
onShowRiskPicker();
break;
case 9://管理行业一级
mTradeList1 = dictBeans;
onShowTrade1Picker();
break;
}
}

4
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/companylib/MineCompanyLibActivity.java
View File

@ -62,8 +62,8 @@ public class MineCompanyLibActivity extends BaseActivity {
TextView mTvErrorHint;
@BindView(R.id.btn_search)
Button mBtnSearch;
@BindView(R.id.btn_clear)
Button mBtnClear;
@BindView(R.id.iv_clear)
ImageView mBtnClear;
private Unbinder mBind;
@BindView(R.id.xlv_com_lib)
XRecyclerView mRlvComList;

4
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/countercheck/CounterCheckMainActivity.java
View File

@ -57,8 +57,8 @@ public class CounterCheckMainActivity extends BaseActivity {
EditText mEtCompanyName;
@BindView(R.id.tv_com_type)
TextView mTvComType;
@BindView(R.id.btn_clear)
Button mBtnClear;
@BindView(R.id.iv_clear)
ImageView mBtnClear;
@BindView(R.id.btn_search)
Button mBtnSearch;
@BindView(R.id.pb_loading)

33
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/countercheck/CounterCheckOptionsActivity.java
View File

@ -94,7 +94,7 @@ public class CounterCheckOptionsActivity extends BaseActivity {
mTvName.setText(name);
mTvPeo.setText(peo);
mTvPublish.setVisibility(View.VISIBLE);
mTvPublish.setText("保存");
mTvPublish.setText("上报");
mTvPublish.setOnClickListener(v -> buildConfirmData(mAdapter.getData()));
mOptions = new ArrayList<>();
mAdapter = new CounterCheckOptionsAdapter(mActivity, mOptions);
@ -106,7 +106,7 @@ public class CounterCheckOptionsActivity extends BaseActivity {
//选择图片
mCurrentIndex = i;
showSelectPhoto(bean);
} else {
} else if (type == 2) {
//预览
ArrayList<String> list = new ArrayList<>();
list.add(bean.getPath());
@ -114,6 +114,22 @@ public class CounterCheckOptionsActivity extends BaseActivity {
intent.putExtra(PhotoActivity.TAG_IMGURL, list);
intent.setClass(mActivity, PhotoActivity.class);
startActivity(intent);
} else {
List<AddPhotoBean> 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);
@ -148,6 +164,7 @@ public class CounterCheckOptionsActivity extends BaseActivity {
public void onNext(SuccessBean successBean) {
dialog.dismiss();
ToastUtils.showShort("上报成功");
setResult(223);
finish();
}
@ -234,11 +251,7 @@ public class CounterCheckOptionsActivity extends BaseActivity {
photoIds += o.getPhotos().get(j).getId() + ",";
}
}
if (photoIds.length() < 10) {
mMProgressDialog.dismiss();
ToastUtils.showShort("检查项中存在未上传图片的项目");
return;
} else {
if (photoIds.length() > 10) {
bean.setScenePhotos(photoIds);
}
} else {
@ -264,11 +277,7 @@ public class CounterCheckOptionsActivity extends BaseActivity {
photoIds += o.getPhotos().get(j).getId() + ",";
}
}
if (photoIds.length() < 10) {
mMProgressDialog.dismiss();
ToastUtils.showShort("检查项中存在未上传图片的项目");
return;
} else {
if (photoIds.length() > 10) {
bean.setScenePhotos(photoIds);
}
}

46
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/CheckOptionsActivity.java
View File

@ -7,6 +7,7 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.FontsContract;
import android.provider.MediaStore;
import android.support.v4.content.FileProvider;
import android.support.v7.widget.LinearLayoutManager;
@ -24,6 +25,7 @@ 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.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;
@ -87,7 +89,12 @@ public class CheckOptionsActivity extends BaseActivity {
mTvBaseTitle.setText("企业检查");
mTvPublish.setVisibility(View.VISIBLE);
mTvPublish.setText("确定");
mTvPublish.setOnClickListener(v -> buildConfirmData(mAdapter.getData()));
mTvPublish.setOnClickListener(v -> {
// Gson gson = new Gson();
// String s = gson.toJson(mAdapter.getData());
// LogUtils.e(s);
buildConfirmData(mAdapter.getData());
});
String id = getIntent().getStringExtra("id");
mCompanyId = getIntent().getStringExtra("cId");
String name = getIntent().getStringExtra("name");
@ -110,7 +117,7 @@ public class CheckOptionsActivity extends BaseActivity {
//选择图片
mCurrentIndex = i;
showSelectPhoto(bean);
} else {
} else if (type == 2) {
//预览
ArrayList<String> list = new ArrayList<>();
list.add(bean.getPath());
@ -118,6 +125,23 @@ public class CheckOptionsActivity extends BaseActivity {
intent.putExtra(PhotoActivity.TAG_IMGURL, list);
intent.setClass(CheckOptionsActivity.this, PhotoActivity.class);
startActivity(intent);
} else {
//删除
List<AddPhotoBean> 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();
}
});
getCheckOptions(id);
@ -151,6 +175,7 @@ public class CheckOptionsActivity extends BaseActivity {
public void onNext(SuccessBean successBean) {
dialog.dismiss();
ToastUtils.showShort("检查成功");
setResult(223);
finish();
}
@ -204,11 +229,7 @@ public class CheckOptionsActivity extends BaseActivity {
photoIds += o.getPhotos().get(j).getId() + ",";
}
}
if (photoIds.length() < 10) {
mMProgressDialog.dismiss();
ToastUtils.showShort("检查项中存在未上传图片的项目");
return;
} else {
if (photoIds.length() > 10) {
bean.setScenePhotos(photoIds);
}
} else {
@ -234,12 +255,11 @@ public class CheckOptionsActivity extends BaseActivity {
photoIds += o.getPhotos().get(j).getId() + ",";
}
}
if (photoIds.length() < 10) {
mMProgressDialog.dismiss();
ToastUtils.showShort("检查项中存在未上传图片的项目");
return;
} else {
if (photoIds.length() > 10) {
bean.setScenePhotos(photoIds);
// mMProgressDialog.dismiss();
// ToastUtils.showShort("检查项中存在未上传图片的项目");
// return;
}
}
items.add(bean);
@ -330,7 +350,7 @@ public class CheckOptionsActivity extends BaseActivity {
mPhotos.add(new AddPhotoBean());
Options o = new Options();
o.setId(checkOptionsbeans.get(i).getCheckItemId());
o.setTitle(checkOptionsbeans.get(i).getSummaryJoinByCheckItemId());
o.setTitle(checkOptionsbeans.get(i).getNameJoinByCheckItemId());
o.setPhotos(mPhotos);
o.setIsMust(checkOptionsbeans.get(i).getType());
mOptions.add(o);

3
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/HistoryDetialActivity.java
View File

@ -1,7 +1,5 @@
package com.sucstepsoft.txrealtimelocation.activitys.issue;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@ -36,7 +34,6 @@ public class HistoryDetialActivity extends BaseActivity {
@Override
protected int setLayoutId() {
return R.layout.activity_history_detial;
}
@Override

6
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/HistoryListActivity.java
View File

@ -56,8 +56,8 @@ public class HistoryListActivity extends BaseActivity {
TextView mTvErrorHint;
@BindView(R.id.xlv_com_lib)
XRecyclerView mXlvComLib;
@BindView(R.id.btn_clear)
Button mBtnClear;
@BindView(R.id.iv_clear)
ImageView mBtnClear;
private Unbinder mBind;
private List<CounterCheckListBean.RowsBean> mDatas = new ArrayList<>();
private HistoryMissionAdapter mAdapter;
@ -565,7 +565,7 @@ public class HistoryListActivity extends BaseActivity {
break;
case STATE_LOAD_EMPTY:
mTvErrorHint.setVisibility(View.VISIBLE);
mTvErrorHint.setText("未找到相关内容");
mTvErrorHint.setText("暂无数据");
mIvEmpty.setVisibility(View.VISIBLE);
mXlvComLib.setVisibility(View.GONE);
mPbLoading.setVisibility(View.GONE);

116
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/PublicAreaActivity.java Normal file
View File

@ -0,0 +1,116 @@
package com.sucstepsoft.txrealtimelocation.activitys.issue;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.jcodecraeer.xrecyclerview.XRecyclerView;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.txrealtimelocation.R;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
public class PublicAreaActivity extends BaseActivity {
@BindView(R.id.et_company_name)
EditText mEtCompanyName;
@BindView(R.id.iv_clear)
ImageView mIvClear;
@BindView(R.id.btn_search)
Button mBtnSearch;
@BindView(R.id.pb_loading)
ProgressBar mPbLoading;
@BindView(R.id.iv_empty)
ImageView mIvEmpty;
@BindView(R.id.tv_error_hint)
TextView mTvErrorHint;
@BindView(R.id.xlv_public_list)
XRecyclerView mXlvPublicList;
private Unbinder mBind;
private int mCurrentPage = 1;
@Override
protected int setLayoutId() {
return R.layout.activity_public_area;
}
@Override
public void initData() {
mBind = ButterKnife.bind(this);
mTvBaseTitle.setText("公共区域");
refreshView(STATE_LOAD_SUCCESS);
mTvPublish.setText("上报");
mTvPublish.setOnClickListener(v -> startActivity(new Intent(mActivity, PublicReportActivity.class)));
stateView(STATE_LOAD_LOADING);
getPublicList(mCurrentPage);
mBtnSearch.setOnClickListener(v -> doSearchList());
mIvClear.setOnClickListener(v -> {
mEtCompanyName.setText("");
mCurrentPage = 1;
getPublicList(mCurrentPage);
});
}
/**
* 获取列表
*/
private void getPublicList(int currentPage) {
}
private void doSearchList() {
String name = mEtCompanyName.getText().toString().trim();
if (!TextUtils.isEmpty(name)) {
}
}
private void stateView(int state) {
switch (state) {
case STATE_LOAD_SUCCESS:
mTvErrorHint.setVisibility(View.GONE);
mXlvPublicList.setVisibility(View.VISIBLE);
mPbLoading.setVisibility(View.GONE);
mIvEmpty.setVisibility(View.GONE);
break;
case STATE_LOAD_EMPTY:
mTvErrorHint.setVisibility(View.VISIBLE);
mTvErrorHint.setText("暂无数据");
mXlvPublicList.setVisibility(View.GONE);
mPbLoading.setVisibility(View.GONE);
mIvEmpty.setVisibility(View.VISIBLE);
break;//空数据
case STATE_LOAD_ERROR:
mTvErrorHint.setVisibility(View.VISIBLE);
mTvErrorHint.setText("数据加载失败,请稍后重试.");
mXlvPublicList.setVisibility(View.GONE);
mPbLoading.setVisibility(View.GONE);
mIvEmpty.setVisibility(View.VISIBLE);
break;//加载错误
case STATE_LOAD_LOADING:
default:
mTvErrorHint.setVisibility(View.VISIBLE);
mTvErrorHint.setText("数据加载中...");
mXlvPublicList.setVisibility(View.GONE);
mPbLoading.setVisibility(View.VISIBLE);
mIvEmpty.setVisibility(View.GONE);
break;
}
}
@Override
protected void onDestroy() {
super.onDestroy();
mBind.unbind();
}
}

44
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/PublicReportActivity.java Normal file
View File

@ -0,0 +1,44 @@
package com.sucstepsoft.txrealtimelocation.activitys.issue;
import android.view.View;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.txrealtimelocation.R;
import butterknife.ButterKnife;
import butterknife.Unbinder;
public class PublicReportActivity extends BaseActivity {
/**
* 公共区域隐患上报
*
*
*
*/
private Unbinder mBind;
@Override
protected int setLayoutId() {
return R.layout.activity_public_report;
}
@Override
public void initData() {
mBind = ButterKnife.bind(this);
mTvBaseTitle.setText("公共隐患上报");
mTvPublish.setVisibility(View.VISIBLE);
mTvPublish.setText("保存");
mTvPublish.setOnClickListener(v -> doSubmit());
}
private void doSubmit() {
}
@Override
protected void onDestroy() {
super.onDestroy();
mBind.unbind();
}
}

2
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/demo/Options.java
View File

@ -15,7 +15,7 @@ public class Options {
private String id;
private List<AddPhotoBean> photos;
private String title;
private EmStateCheck state = EmStateCheck.NORMAL;//检查状态 normal 未检查 check合格 uncheck不合格
private EmStateCheck state = EmStateCheck.NORMAL;//检查状态 normal未检查 check合格 uncheck不合格
private int rectify = 4;//立即整改-4,限期整改-5 不配合-6
private int isMust = 1;//1 必查 2选查
//整改期限

344
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/demo/OptionsAdapter.java
View File

@ -14,9 +14,11 @@ 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.LogUtils;
import com.sucstepsoft.txrealtimelocation.R;
import com.sucstepsoft.txrealtimelocation.widget.EmStateCheck;
import java.util.ArrayList;
import java.util.List;
/**
@ -26,8 +28,16 @@ import java.util.List;
* 描述:
*/
public class OptionsAdapter extends BaseRecyclerAdapter<Options, OptionsHolder> {
private ArrayAdapter<String> mDefaultApater;
private ArrayAdapter<String> mAdapter;
private String[] mNowStrings;
private String[] mTermStrings;
public OptionsAdapter(Context ctx, List<Options> list) {
super(ctx, list);
mNowStrings = mContext.getResources().getStringArray(R.array.limit);
mTermStrings = mContext.getResources().getStringArray(R.array.timeLimit);
}
@Override
@ -39,164 +49,239 @@ public class OptionsAdapter extends BaseRecyclerAdapter<Options, OptionsHolder>
@Override
public void bindHolder(OptionsHolder oHolder, int i) {
//设置是否必须星号
if (mData.get(i).getIsMust() == 1) {
oHolder.mIvIsMust.setVisibility(View.VISIBLE);
} else {
oHolder.mIvIsMust.setVisibility(View.GONE);
}
oHolder.mScvOptions.setCheckState(mData.get(i).getState());
oHolder.mScvOptions.setOnClickListener(v -> {
EmStateCheck state = oHolder.mScvOptions.getViewState();
switch (state) {
case NORMAL://未检查
oHolder.mScvOptions.setCheckState(EmStateCheck.CHECK);
mData.get(i).setState(EmStateCheck.CHECK);
initContentView(oHolder, mData.get(i), i);
break;
case CHECK://合格
oHolder.mScvOptions.setCheckState(EmStateCheck.UNCHECK);
mData.get(i).setState(EmStateCheck.UNCHECK);
initContentView(oHolder, mData.get(i), i);
break;
case UNCHECK://有隐患
oHolder.mScvOptions.setCheckState(EmStateCheck.NORMAL);
//设置检查项名称
oHolder.mTvTitle.setText(mData.get(i).getTitle());
oHolder.mRgState.setOnCheckedChangeListener(null);
if (mData.get(i).getState() == EmStateCheck.UNCHECK) {
//不合格
oHolder.mLlContent.setVisibility(View.VISIBLE);
oHolder.mRlvPhotos.setVisibility(View.VISIBLE);
setDisData(oHolder, mData.get(i), i);
} else if (mData.get(i).getState() == EmStateCheck.CHECK) {
//合格
oHolder.mLlContent.setVisibility(View.GONE);
oHolder.mRlvPhotos.setVisibility(View.VISIBLE);
setCheckData(oHolder, mData.get(i), i);
} else {
//未检查
oHolder.mLlContent.setVisibility(View.GONE);
oHolder.mRlvPhotos.setVisibility(View.GONE);
setNomarlData(oHolder, mData.get(i), i);
}
oHolder.mRgState.setOnCheckedChangeListener((radioGroup, i1) -> {
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;
}
});
if (mData.get(i).getState() == EmStateCheck.UNCHECK || mData.get(i).getState() == EmStateCheck.CHECK) {
initContentView(oHolder, mData.get(i), i);
} else {
oHolder.mLlContent.setVisibility(View.GONE);
oHolder.mRlvPhotos.setVisibility(View.GONE);
}
oHolder.mTvTitle.setText(mData.get(i).getTitle());
setPhotoView(mData.get(i), oHolder, i);
}
private void initContentView(OptionsHolder oHolder, Options op, int index) {
//1.合格只要相片
//2.存在隐患
// 立即整改 当天 立即 rg 图片
// 限期增改 1 5 10 15 20 25 30天 选择spinner 图片
oHolder.mRlvPhotos.setVisibility(View.VISIBLE);
EmStateCheck state = mData.get(index).getState();
//合格
if (state == EmStateCheck.CHECK) {
oHolder.mLlContent.setVisibility(View.GONE);
} else {
oHolder.mLlContent.setVisibility(View.VISIBLE);
/**
* 设置不合格数据
*
* @param oHolder
* @param op
* @param index
*/
private void setDisData(OptionsHolder 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[] defaultArray = mContext.getResources().getStringArray(R.array.limit);
ArrayAdapter<String> defaultApater = new ArrayAdapter<>(mContext, R.layout.item_pop_text, defaultArray);
oHolder.mSpinner.setAdapter(defaultApater);
if (op.getRectify() == 0) {
mData.get(index).setTimeLimit("立即整改");
oHolder.mRbNow.setChecked(true);
} else {
if (op.getRectify() == 4) {
oHolder.mSpinner.setAdapter(defaultApater);
oHolder.mRg.check(R.id.rb_now);
if (!TextUtils.isEmpty(op.getTimeLimit())) {
if (op.getTimeLimit().equals("立即整改")) {
oHolder.mSpinner.setSelection(0);
} else {
oHolder.mSpinner.setSelection(1);
}
}
} else if (op.getRectify() == 5) {
String[] strArray = mContext.getResources().getStringArray(R.array.timeLimit);
ArrayAdapter<String> adapter = new ArrayAdapter<>(mContext, R.layout.item_pop_text, strArray);
oHolder.mSpinner.setAdapter(adapter);
oHolder.mRg.check(R.id.rb_term);
if (!TextUtils.isEmpty(op.getTimeLimit())) {
switch (op.getTimeLimit()) {
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;
}
}
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);
} else {
oHolder.mRg.check(R.id.rb_coor);
oHolder.mSpinner.setSelection(1);
}
} else {
//未选择过
oHolder.mSpinner.setSelection(0);
}
oHolder.mRg.setOnCheckedChangeListener((radioGroup, id) -> {
if (id == R.id.rb_now) {
oHolder.mLlSp.setVisibility(View.VISIBLE);
//立即整改
oHolder.mSpinner.setAdapter(defaultApater);
mData.get(index).setRectify(4);
mData.get(index).setTimeLimit("立即整改");
oHolder.mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
String s = defaultArray[i];
mData.get(index).setTimeLimit(s);
}
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) {
@Override
public void onNothingSelected(AdapterView<?> adapterView) {
}
});
} else if (id == R.id.rb_term) {
//限期整改
oHolder.mLlSp.setVisibility(View.VISIBLE);
mData.get(index).setRectify(5);
mData.get(index).setTimeLimit("1天");
String[] strArray = mContext.getResources().getStringArray(R.array.timeLimit);
ArrayAdapter<String> adapter = new ArrayAdapter<>(mContext, R.layout.item_pop_text, strArray);
oHolder.mSpinner.setAdapter(adapter);
oHolder.mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
String s = strArray[i];
mData.get(index).setTimeLimit(s);
}
@Override
public void onNothingSelected(AdapterView<?> adapterView) {
}
});
} else {
//不配合
oHolder.mLlSp.setVisibility(View.GONE);
mData.get(index).setRectify(6);
}
});
} 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);
}
AddPhotoAdapter photoAdapter = new AddPhotoAdapter(mContext, op.getPhotos());
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(OptionsHolder 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(OptionsHolder 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, OptionsHolder oHolder, int index) {
AddPhotoAdapter photoAdapter = new AddPhotoAdapter(mContext, mData.get(index).getPhotos());
oHolder.mRlvPhotos.setAdapter(photoAdapter);
oHolder.mRlvPhotos.setLayoutManager(new GridLayoutManager(mContext, 4));
photoAdapter.addOnDeleteListener((bean, i) -> {
mSelectPhotoListener.onSelectPhoto(bean, mData.get(index), index, 3);
});
photoAdapter.addOnItemClickListener(bean -> {
if (mSelectPhotoListener != null) {
if (TextUtils.isEmpty(bean.getPath())) {
//空数据,选择图片
mSelectPhotoListener.onSelectPhoto(bean, op, index, 1);
mSelectPhotoListener.onSelectPhoto(bean, mData.get(index), index, 1);
} else {
mSelectPhotoListener.onSelectPhoto(bean, op, index, 2);
mSelectPhotoListener.onSelectPhoto(bean, mData.get(index), index, 2);
}
}
});
@ -211,4 +296,5 @@ public class OptionsAdapter extends BaseRecyclerAdapter<Options, OptionsHolder>
public interface SelectPhoto {
void onSelectPhoto(AddPhotoBean bean, Options options, int i, int type);
}
}

6
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/demo/OptionsHolder.java
View File

@ -21,7 +21,7 @@ import com.sucstepsoft.txrealtimelocation.widget.StateCheckView;
*/
public class OptionsHolder extends RecyclerView.ViewHolder {
public TextView mTvTitle;
public StateCheckView mScvOptions;
// public StateCheckView mScvOptions;
public RecyclerView mRlvPhotos;
public LinearLayout mLlContent;
public AppCompatSpinner mSpinner;
@ -29,11 +29,13 @@ public class OptionsHolder extends RecyclerView.ViewHolder {
public LinearLayout mLlSp;
public RadioButton mRbNow;
public ImageView mIvIsMust;
public RadioGroup mRgState;
public OptionsHolder(@NonNull View itemView) {
super(itemView);
mTvTitle = itemView.findViewById(R.id.tv_title);
mScvOptions = itemView.findViewById(R.id.scv_options);
// mScvOptions = itemView.findViewById(R.id.scv_options);
mRgState = itemView.findViewById(R.id.rg_state);
mRlvPhotos = itemView.findViewById(R.id.rlv_photos);
mLlContent = itemView.findViewById(R.id.ll_content);
mSpinner = itemView.findViewById(R.id.sp_term);

1
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/lawlib/LawLibActivity.java
View File

@ -146,7 +146,6 @@ public class LawLibActivity extends BaseActivity {
mXlvComLib.loadMoreComplete();
}
refreshView(STATE_LOAD_ERROR);
// ToastUtils.showShort("数据加载失败,请稍后重试");
}
@Override

8
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/mine/MineMissionActivity.java
View File

@ -60,8 +60,8 @@ public class MineMissionActivity extends BaseActivity {
TextView mTvErrorHint;
@BindView(R.id.xlv_com_lib)
XRecyclerView mXlvComLib;
@BindView(R.id.btn_clear)
Button mBtnClear;
@BindView(R.id.iv_clear)
ImageView mBtnClear;
private Unbinder mBind;
private List<CounterCheckListBean.RowsBean> mDatas = new ArrayList<>();
private CounterCheckListAdapter mAdapter;
@ -101,7 +101,7 @@ public class MineMissionActivity extends BaseActivity {
// }
// }
// });
refreshView(STATE_LOAD_SUCCESS);
refreshView(STATE_LOAD_EMPTY);
reStateView(STATE_LOAD_LOADING);
initView();
}
@ -584,7 +584,7 @@ public class MineMissionActivity extends BaseActivity {
break;
case STATE_LOAD_EMPTY:
mTvErrorHint.setVisibility(View.VISIBLE);
mTvErrorHint.setText("未找到相关内容");
mTvErrorHint.setText("暂无数据");
mIvEmpty.setVisibility(View.VISIBLE);
mXlvComLib.setVisibility(View.GONE);
mPbLoading.setVisibility(View.GONE);

58
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/trouble/SelCompanyActivity.java
View File

@ -20,6 +20,7 @@ import com.jcodecraeer.xrecyclerview.XRecyclerView;
import com.sucstepsoft.cm_utils.constant.PathConfig;
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.BaseRecyclerAdapter;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
@ -63,8 +64,8 @@ public class SelCompanyActivity extends BaseActivity {
TextView mTvErrorHint;
@BindView(R.id.xlv_com_lib)
XRecyclerView mXlvComLib;
@BindView(R.id.btn_clear)
Button mBtnClear;
@BindView(R.id.iv_clear)
ImageView mBtnClear;
private Unbinder mBind;
private List<CompanyListDataBean.RowsBean> mDatas = new ArrayList<>();
private CompanyCheckAdapter mAdapter;
@ -88,27 +89,27 @@ public class SelCompanyActivity extends BaseActivity {
public void initData() {
mBind = ButterKnife.bind(this);
mTvBaseTitle.setText("隐患上报");
mTvPublish.setVisibility(View.VISIBLE);
mTvPublish.setText("检查");
mTvPublish.setOnClickListener(v -> {
String selDataId = mAdapter.getSelDataId();
if (TextUtils.isEmpty(selDataId)) {
ToastUtils.showShort("请选择企业");
} else {
for (int i = 0; i < mDatas.size(); i++) {
if (mDatas.get(i).getEnterpriseId().equals(selDataId)) {
Intent intent = new Intent(mActivity, CheckOptionsActivity.class);
intent.putExtra("id", mDatas.get(i).getIndustryJoinByEnterpriseId());
intent.putExtra("cId", mDatas.get(i).getEnterpriseId());
intent.putExtra("name", mDatas.get(i).getNameJoinByEnterpriseId());
intent.putExtra("peo", mDatas.get(i).getMasterJoinByEnterpriseId());
intent.putExtra("phone", mDatas.get(i).getPhoneJoinByEnterpriseId());
startActivity(intent);
break;
}
}
}
});
// mTvPublish.setVisibility(View.GONE);
// mTvPublish.setText("检查");
// mTvPublish.setOnClickListener(v -> {
// String selDataId = mAdapter.getSelDataId();
// if (TextUtils.isEmpty(selDataId)) {
// ToastUtils.showShort("请选择企业");
// } else {
// for (int i = 0; i < mDatas.size(); i++) {
// if (mDatas.get(i).getEnterpriseId().equals(selDataId)) {
// Intent intent = new Intent(mActivity, CheckOptionsActivity.class);
// intent.putExtra("id", mDatas.get(i).getIndustryJoinByEnterpriseId());
// intent.putExtra("cId", mDatas.get(i).getEnterpriseId());
// intent.putExtra("name", mDatas.get(i).getNameJoinByEnterpriseId());
// intent.putExtra("peo", mDatas.get(i).getMasterJoinByEnterpriseId());
// intent.putExtra("phone", mDatas.get(i).getPhoneJoinByEnterpriseId());
// startActivity(intent);
// break;
// }
// }
// }
// });
refreshView(STATE_LOAD_SUCCESS);
reStateView(STATE_LO);
initView();
@ -117,6 +118,15 @@ public class SelCompanyActivity extends BaseActivity {
private void initView() {
mAdapter = new CompanyCheckAdapter(mActivity, mDatas);
mXlvComLib.setAdapter(mAdapter);
mAdapter.addOnItemClickListener(bean -> {
Intent intent = new Intent(mActivity, CheckOptionsActivity.class);
intent.putExtra("id", bean.getIndustryJoinByEnterpriseId());
intent.putExtra("cId",bean.getEnterpriseId());
intent.putExtra("name", bean.getNameJoinByEnterpriseId());
intent.putExtra("peo", bean.getMasterJoinByEnterpriseId());
intent.putExtra("phone",bean.getPhoneJoinByEnterpriseId());
startActivity(intent);
});
LinearLayoutManager layoutManager = new LinearLayoutManager(mActivity);
layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
mXlvComLib.setLayoutManager(layoutManager);
@ -578,7 +588,7 @@ public class SelCompanyActivity extends BaseActivity {
break;
case STATE_EM:
mTvErrorHint.setVisibility(View.VISIBLE);
mTvErrorHint.setText("未找到相关内容");
mTvErrorHint.setText("暂无数据");
mIvEmpty.setVisibility(View.VISIBLE);
mXlvComLib.setVisibility(View.GONE);
mPbLoading.setVisibility(View.GONE);

1
app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/CompanyLibAdapter.java
View File

@ -36,7 +36,6 @@ public class CompanyLibAdapter extends BaseRecyclerAdapter<CompanyListDataBean.R
companyHolder.mTvAddress.setText("地址:" + mData.get(i).getArea2DictionaryName() + mData.get(i).getArea3DictionaryName() + mData.get(i).getArea4DictionaryName() + mData.get(i).getArea5DictionaryName());
companyHolder.mTvCompanyName.setText(mData.get(i).getNameJoinByEnterpriseId());
companyHolder.mTvCompanyPeo.setText("负责人:" + mData.get(i).getMasterJoinByEnterpriseId());
LogUtils.e("刷新了");
if (TextUtils.isEmpty(mData.get(i).getUserId())) {
companyHolder.mBtnClain.setVisibility(View.VISIBLE);
companyHolder.mBtnUnClaim.setVisibility(View.GONE);

4
app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/CounterCheckListAdapter.java
View File

@ -16,7 +16,7 @@ import java.util.List;
* 作者: adam
* 日期: 2020/4/2 - 10:02 AM
* 邮箱: itgaojian@163.com
* 描述:
* 描述: 隐患复查企业列表
*/
public class CounterCheckListAdapter extends BaseRecyclerAdapter<CounterCheckListBean.RowsBean, CounterCheckListHolder> {
public CounterCheckListAdapter(Context ctx, List<CounterCheckListBean.RowsBean> list) {
@ -33,6 +33,6 @@ public class CounterCheckListAdapter extends BaseRecyclerAdapter<CounterCheckLis
public void bindHolder(CounterCheckListHolder holder, int i) {
holder.mTvAddress.setText("地址:" + mData.get(i).getAddressJoinByEnterpriseId());
holder.mTvName.setText(mData.get(i).getNameJoinByEnterpriseId());
holder.mTvPeo.setText("负责人:" + mData.get(i).getMasterJoinByEnterpriseId());
// holder.mTvPeo.setText("法人:" + mData.get(i).getMasterJoinByEnterpriseId());
}
}

337
app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/CounterCheckOptionsAdapter.java
View File

@ -12,9 +12,11 @@ import android.widget.ArrayAdapter;
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.LogUtils;
import com.sucstepsoft.txrealtimelocation.R;
import com.sucstepsoft.txrealtimelocation.activitys.issue.demo.Options;
import com.sucstepsoft.txrealtimelocation.activitys.issue.demo.OptionsAdapter;
import com.sucstepsoft.txrealtimelocation.activitys.issue.demo.OptionsHolder;
import com.sucstepsoft.txrealtimelocation.adapters.holders.CounterCheckOptionHolder;
import com.sucstepsoft.txrealtimelocation.widget.EmStateCheck;
@ -27,9 +29,15 @@ import java.util.List;
* 描述:
*/
public class CounterCheckOptionsAdapter extends BaseRecyclerAdapter<Options, CounterCheckOptionHolder> {
private ArrayAdapter<String> mDefaultApater;
private ArrayAdapter<String> mAdapter;
private String[] mNowStrings;
private String[] mTermStrings;
public CounterCheckOptionsAdapter(Context ctx, List list) {
super(ctx, list);
mNowStrings = mContext.getResources().getStringArray(R.array.limit);
mTermStrings = mContext.getResources().getStringArray(R.array.timeLimit);
}
@Override
@ -40,165 +48,236 @@ public class CounterCheckOptionsAdapter extends BaseRecyclerAdapter<Options, Cou
@Override
public void bindHolder(CounterCheckOptionHolder oHolder, int i) {
//设置是否必须星号
if (mData.get(i).getIsMust() == 1) {
oHolder.mIvIsMust.setVisibility(View.VISIBLE);
} else {
oHolder.mIvIsMust.setVisibility(View.GONE);
}
oHolder.mScvOptions.setCheckState(mData.get(i).getState());
oHolder.mScvOptions.setOnClickListener(v -> {
EmStateCheck state = oHolder.mScvOptions.getViewState();
switch (state) {
case NORMAL://未检查
oHolder.mScvOptions.setCheckState(EmStateCheck.CHECK);
mData.get(i).setState(EmStateCheck.CHECK);
initContentView(oHolder, mData.get(i), i);
break;
case CHECK://合格
oHolder.mScvOptions.setCheckState(EmStateCheck.UNCHECK);
mData.get(i).setState(EmStateCheck.UNCHECK);
initContentView(oHolder, mData.get(i), i);
break;
case UNCHECK://有隐患
oHolder.mScvOptions.setCheckState(EmStateCheck.NORMAL);
//设置检查项名称
oHolder.mTvTitle.setText(mData.get(i).getTitle());
oHolder.mRgState.setOnCheckedChangeListener(null);
if (mData.get(i).getState() == EmStateCheck.UNCHECK) {
//不合格
oHolder.mLlContent.setVisibility(View.VISIBLE);
oHolder.mRlvPhotos.setVisibility(View.VISIBLE);
setDisData(oHolder, mData.get(i), i);
} else if (mData.get(i).getState() == EmStateCheck.CHECK) {
//合格
oHolder.mLlContent.setVisibility(View.GONE);
oHolder.mRlvPhotos.setVisibility(View.VISIBLE);
setCheckData(oHolder, mData.get(i), i);
} else {
//未检查
oHolder.mLlContent.setVisibility(View.GONE);
oHolder.mRlvPhotos.setVisibility(View.GONE);
setNomarlData(oHolder, mData.get(i), i);
}
oHolder.mRgState.setOnCheckedChangeListener((radioGroup, i1) -> {
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;
}
});
if (mData.get(i).getState() == EmStateCheck.UNCHECK || mData.get(i).getState() == EmStateCheck.CHECK) {
initContentView(oHolder, mData.get(i), i);
} else {
oHolder.mLlContent.setVisibility(View.GONE);
oHolder.mRlvPhotos.setVisibility(View.GONE);
}
oHolder.mTvTitle.setText(mData.get(i).getTitle());
setPhotoView(mData.get(i), oHolder, i);
}
private void initContentView(CounterCheckOptionHolder oHolder, Options op, int index) {
//1.合格只要相片
//2.存在隐患
// 立即整改 当天 立即 rg 图片
// 限期增改 1 5 10 15 20 25 30天 选择spinner 图片
oHolder.mRlvPhotos.setVisibility(View.VISIBLE);
EmStateCheck state = mData.get(index).getState();
//合格
if (state == EmStateCheck.CHECK) {
oHolder.mLlContent.setVisibility(View.GONE);
} else {
oHolder.mLlContent.setVisibility(View.VISIBLE);
/**
* 设置不合格数据
*
* @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[] defaultArray = mContext.getResources().getStringArray(R.array.limit);
ArrayAdapter<String> defaultApater = new ArrayAdapter<>(mContext, R.layout.item_pop_text, defaultArray);
oHolder.mSpinner.setAdapter(defaultApater);
if (op.getRectify() == 0) {
mData.get(index).setTimeLimit("立即整改");
oHolder.mRbNow.setChecked(true);
} else {
if (op.getRectify() == 4) {
oHolder.mSpinner.setAdapter(defaultApater);
oHolder.mRg.check(R.id.rb_now);
if (!TextUtils.isEmpty(op.getTimeLimit())) {
if (op.getTimeLimit().equals("立即整改")) {
oHolder.mSpinner.setSelection(0);
} else {
oHolder.mSpinner.setSelection(1);
}
}
} else if (op.getRectify() == 5) {
String[] strArray = mContext.getResources().getStringArray(R.array.timeLimit);
ArrayAdapter<String> adapter = new ArrayAdapter<>(mContext, R.layout.item_pop_text, strArray);
oHolder.mSpinner.setAdapter(adapter);
oHolder.mRg.check(R.id.rb_term);
if (!TextUtils.isEmpty(op.getTimeLimit())) {
switch (op.getTimeLimit()) {
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;
}
}
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);
} else {
oHolder.mRg.check(R.id.rb_coor);
oHolder.mSpinner.setSelection(1);
}
} 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);
}
oHolder.mRg.setOnCheckedChangeListener((radioGroup, id) -> {
if (id == R.id.rb_now) {
oHolder.mLlSp.setVisibility(View.VISIBLE);
//立即整改
oHolder.mSpinner.setAdapter(defaultApater);
mData.get(index).setRectify(4);
mData.get(index).setTimeLimit("立即整改");
oHolder.mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
String s = defaultArray[i];
mData.get(index).setTimeLimit(s);
}
@Override
public void onNothingSelected(AdapterView<?> adapterView) {
@Override
public void onNothingSelected(AdapterView<?> adapterView) {
}
});
} else if (id == R.id.rb_term) {
//限期整改
oHolder.mLlSp.setVisibility(View.VISIBLE);
mData.get(index).setRectify(5);
mData.get(index).setTimeLimit("1天");
String[] strArray = mContext.getResources().getStringArray(R.array.timeLimit);
ArrayAdapter<String> adapter = new ArrayAdapter<>(mContext, R.layout.item_pop_text, strArray);
oHolder.mSpinner.setAdapter(adapter);
oHolder.mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
String s = strArray[i];
mData.get(index).setTimeLimit(s);
}
@Override
public void onNothingSelected(AdapterView<?> adapterView) {
}
});
} else {
//不配合
oHolder.mLlSp.setVisibility(View.GONE);
mData.get(index).setRectify(6);
}
});
} 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);
}
AddPhotoAdapter photoAdapter = new AddPhotoAdapter(mContext, op.getPhotos());
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, op, index, 1);
mSelectPhotoListener.onSelectPhoto(bean, mData.get(index), index, 1);
} else {
mSelectPhotoListener.onSelectPhoto(bean, op, index, 2);
mSelectPhotoListener.onSelectPhoto(bean, mData.get(index), index, 2);
}
}
});

6
app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/MissionDetailAdapter.java
View File

@ -2,6 +2,7 @@ package com.sucstepsoft.txrealtimelocation.adapters;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.support.v7.widget.GridLayoutManager;
import android.text.TextUtils;
import android.view.LayoutInflater;
@ -43,23 +44,28 @@ public class MissionDetailAdapter extends BaseRecyclerAdapter<HistoryMissionBean
switch (mData.get(i).getCheckResult()) {
case 1:
holder.mTvCheckType.setText("检查合格");
holder.mTvCheckType.setTextColor(Color.GREEN);
holder.mTvDay.setVisibility(View.GONE);
break;
case 2:
holder.mTvCheckType.setText("立即整改");
holder.mTvCheckType.setTextColor(Color.RED);
holder.mTvDay.setVisibility(View.GONE);
break;
case 3:
holder.mTvCheckType.setText("限期整改");
holder.mTvDay.setVisibility(View.VISIBLE);
holder.mTvCheckType.setTextColor(Color.RED);
holder.mTvDay.setText(mData.get(i).getRectificationDays() + "天");
break;
case 4:
holder.mTvCheckType.setText("企业不配合");
holder.mTvCheckType.setTextColor(Color.RED);
holder.mTvDay.setVisibility(View.GONE);
break;
case 0:
default:
holder.mTvCheckType.setTextColor(Color.RED);
holder.mTvCheckType.setText("未检查");
holder.mTvDay.setVisibility(View.GONE);
break;

7
app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/holders/CounterCheckOptionHolder.java
View File

@ -21,7 +21,7 @@ import com.sucstepsoft.txrealtimelocation.widget.StateCheckView;
*/
public class CounterCheckOptionHolder extends RecyclerView.ViewHolder {
public TextView mTvTitle;
public StateCheckView mScvOptions;
// public StateCheckView mScvOptions;
public RecyclerView mRlvPhotos;
public LinearLayout mLlContent;
public AppCompatSpinner mSpinner;
@ -29,11 +29,14 @@ public class CounterCheckOptionHolder extends RecyclerView.ViewHolder {
public LinearLayout mLlSp;
public RadioButton mRbNow;
public ImageView mIvIsMust;
public RadioGroup mRgState;
public CounterCheckOptionHolder(@NonNull View itemView) {
super(itemView);
mTvTitle = itemView.findViewById(R.id.tv_title);
mScvOptions = itemView.findViewById(R.id.scv_options);
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);

92
app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CompanyDetailBean.java
View File

@ -9,30 +9,35 @@ package com.sucstepsoft.txrealtimelocation.beans;
public class CompanyDetailBean {
/**
* enterpriseId : 8cdf6a13-6ca4-40c2-963c-fbe264cb8cb2
* name : 张三牛肉店
* enterpriseId : f5cd377c-173a-4211-8948-0566c0fe0825
* name : 测试企业
* type : 7965a3b7-47b7-4843-b030-91f1bd4428e5
* typeDictionaryName :
* area1 : a91b43a2-e92a-43e6-8788-0c636c44f9b6
* area1DictionaryName :
* area2 : 905a4a20-2ffc-4d73-b6f0-eca0c7565b75
* area2DictionaryName :
* area3 : 281c2d38-a904-454a-9325-b5caee1c851c
* area3DictionaryName :
* area4 : 470e65d7-78b0-4a84-afb6-911b0f5db56a
* area4DictionaryName :
* area5 : e772333e-6900-43ae-a2f9-bf77d49cdf06
* area5DictionaryName :
* address : 102号街
* industry : 706b8520-3a1d-431e-a203-0d307dc22e87
* typeDictionaryName : 企业法人
* area1 : 6aba668e-8ab3-4fbb-8886-b2d468ccf00e
* area1DictionaryName : 内蒙古
* area2 : 3f62e230-47a5-4ad9-ab01-08fd2c5218d8
* area2DictionaryName : 包头市
* area3 : 63a6e1aa-7bfc-4083-bb17-5889bb86fb81
* area3DictionaryName : 青山区
* area4 : a51f1602-f9ea-4a7e-93b3-918cb069222d
* area4DictionaryName : 富强路街道办事处
* area5 : 24cb3b59-1284-45db-87d6-ef5512642061
* area5DictionaryName : 锦林社区
* address : 汤普森在宿舍
* industryType :
* industryTypeDictionaryName :
* industry :
* industryDictionaryName :
* engagedCount : 1
* engagedCount : 80
* riskOperation : f0b47289-f451-40c5-a57e-7042f69e5c2c
* riskOperationDictionaryName :
* master : 张三
* phone : 13888888888
* factoryGate : 5ba2de3f-38fc-4fee-85c0-f74d012ad71f
* workplace : 100a5050-a6b9-4612-a9ee-53c3546b5dd3
* riskOperationDictionaryName : 危险化学品
* master : 仔细
* phone : 15661078692
* factoryGate : 9709dbb4-4462-460d-a640-0dc53440667c,
* workplace : 70755a13-d6d3-40d3-b92d-37e9ae8ec707,
* bussinessRegNum : bdbdbdhshsh544887846
* legalPerson : 李氏
* summary : 你一诺去去去婆婆你要去去上学
*/
private String enterpriseId;
@ -50,6 +55,8 @@ public class CompanyDetailBean {
private String area5;
private String area5DictionaryName;
private String address;
private String industryType;
private String industryTypeDictionaryName;
private String industry;
private String industryDictionaryName;
private int engagedCount;
@ -59,6 +66,9 @@ public class CompanyDetailBean {
private String phone;
private String factoryGate;
private String workplace;
private String bussinessRegNum;
private String legalPerson;
private String summary;
public String getEnterpriseId() {
return enterpriseId;
@ -180,6 +190,22 @@ public class CompanyDetailBean {
this.address = address;
}
public String getIndustryType() {
return industryType;
}
public void setIndustryType(String industryType) {
this.industryType = industryType;
}
public String getIndustryTypeDictionaryName() {
return industryTypeDictionaryName;
}
public void setIndustryTypeDictionaryName(String industryTypeDictionaryName) {
this.industryTypeDictionaryName = industryTypeDictionaryName;
}
public String getIndustry() {
return industry;
}
@ -251,4 +277,28 @@ public class CompanyDetailBean {
public void setWorkplace(String workplace) {
this.workplace = workplace;
}
public String getBussinessRegNum() {
return bussinessRegNum;
}
public void setBussinessRegNum(String bussinessRegNum) {
this.bussinessRegNum = bussinessRegNum;
}
public String getLegalPerson() {
return legalPerson;
}
public void setLegalPerson(String legalPerson) {
this.legalPerson = legalPerson;
}
public String getSummary() {
return summary;
}
public void setSummary(String summary) {
this.summary = summary;
}
}

44
app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/CompanyEnterBean.java
View File

@ -42,6 +42,50 @@ public class CompanyEnterBean {
private String riskOperationPid;//风险父ID
private String type;//类型
private String workplace;//
private String summary;//营业范围
private String legalPerson;//企业法人
private String bussinessRegNum;//组织机构代码
private String industryType;//行业类型
public String getRiskOperationPid() {
return riskOperationPid;
}
public void setRiskOperationPid(String riskOperationPid) {
this.riskOperationPid = riskOperationPid;
}
public String getSummary() {
return summary;
}
public void setSummary(String summary) {
this.summary = summary;
}
public String getLegalPerson() {
return legalPerson;
}
public void setLegalPerson(String legalPerson) {
this.legalPerson = legalPerson;
}
public String getBussinessRegNum() {
return bussinessRegNum;
}
public void setBussinessRegNum(String bussinessRegNum) {
this.bussinessRegNum = bussinessRegNum;
}
public String getIndustryType() {
return industryType;
}
public void setIndustryType(String industryType) {
this.industryType = industryType;
}
public String getAddress() {
return address;

2
app/src/main/java/com/sucstepsoft/txrealtimelocation/net/LocationApiService.java
View File

@ -629,7 +629,7 @@ public interface LocationApiService {
//industrycheckitem/listindustrycheckitem/{id}
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("industrycheckitem/listindustrycheckitem")
Observable<List<CheckOptionsbean>> getCheckOptionsList(@Query("id") String id, @Header("token") String token);
Observable<List<CheckOptionsbean>> getCheckOptionsList(@Query("industryId") String id, @Header("token") String token);
//保存检查结果
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})

BIN
app/src/main/res/drawable-xhdpi/ic_item_idcard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 771 B

BIN
app/src/main/res/drawable-xhdpi/ic_item_user.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_main_c_info.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_main_history.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_main_law.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_main_mine.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_main_report.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_main_risk.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_rb_check.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 906 B

BIN
app/src/main/res/drawable-xhdpi/ic_rb_uncheck.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 709 B

9
app/src/main/res/drawable/sel_btn_submit_no_size.xml Executable file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_btn_nomal_gray_no_size" android:state_selected="true" />
<item android:drawable="@drawable/shape_btn_nomal_gray_no_size" android:state_pressed="true" />
<item android:drawable="@drawable/shape_btn_nomal_gray_no_size" android:state_enabled="false" />
<item android:drawable="@drawable/shape_btn_green_sel_no_size" android:state_selected="false" />
<item android:drawable="@drawable/shape_btn_green_sel_no_size" android:state_pressed="false" />
<item android:drawable="@drawable/shape_btn_green_sel_no_size" android:state_enabled="true" />
</selector>

5
app/src/main/res/drawable/sel_rb.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_rb_uncheck" android:state_checked="false" />
<item android:drawable="@drawable/ic_rb_check" android:state_checked="true" />
</selector>

6
app/src/main/res/drawable/shape_btn_green_sel_no_size.xml Executable file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/titleBar" />
<corners android:radius="6dp" />
</shape>

6
app/src/main/res/drawable/shape_btn_nomal_gray_no_size.xml Executable file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/gray_df" />
<corners android:radius="6dp" />
</shape>

6
app/src/main/res/drawable/shape_search_box.xml Executable file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ffffffff" />
<corners android:radius="5dp" />
</shape>

6
app/src/main/res/drawable/sp_blue_sel.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#401189FF" />
<corners android:radius="16dp" />
</shape>

6
app/src/main/res/drawable/sp_company_item_box.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ffffffff" />
<corners android:radius="3dp" />
</shape>

6
app/src/main/res/drawable/sp_red_sel.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#40de0e0e" />
<corners android:radius="16dp" />
</shape>

1
app/src/main/res/drawable/sp_square_btn_blue_rim.xml
View File

@ -2,7 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="5dp" />
<!-- <solid android:color="@color/blue" />-->
<stroke
android:width="1dp"
android:color="@color/blue" />

2
app/src/main/res/drawable/sp_square_btn_blue_sel.xml
View File

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="5dp" />
<solid android:color="@color/blue" />
<solid android:color="@color/white" />
</shape>

71
app/src/main/res/layout/activity_check_options_ce.xml
View File

@ -18,53 +18,58 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.v7.widget.CardView
<LinearLayout
android:id="@+id/ll_company_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
app:cardCornerRadius="10dp"
app:cardPreventCornerOverlap="true"
app:cardUseCompatPadding="false">
android:layout_margin="5dp"
android:background="@drawable/sp_company_item_box"
android:orientation="vertical"
android:padding="5dp">
<LinearLayout
android:id="@+id/ll_company_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
android:padding="5dp">
android:orientation="horizontal">
<TextView
style="@style/company_name_title"
android:text="企业名称" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tv_name"
style="@style/company_content"
tools:text="企业名称企业名称企业名称企业名称企业名称" />
<TextView
style="@style/company_name_title"
android:drawableLeft="@drawable/ic_item_user"
android:text="企业名称" />
<TextView
style="@style/company_name_title"
android:text="主要负责人" />
<TextView
android:id="@+id/tv_peo"
style="@style/company_content"
android:text="企业名称企业名称企业名称企业名称企业名称" />
<TextView
android:id="@+id/tv_name"
style="@style/company_content"
tools:text="企业名称企业名称企业名称企业名称企业名称" />
</LinearLayout>
<Button
android:id="@+id/btn_unclaim"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/sel_btn_submit"
android:layout_width="wrap_content"
android:layout_height="27dp"
android:background="@drawable/sp_blue_sel"
android:text="企业不配合"
android:textColor="@color/white" />
android:textColor="@color/titleBar" />
</LinearLayout>
</android.support.v7.widget.CardView>
<TextView
style="@style/company_name_title"
android:drawableLeft="@drawable/ic_item_idcard"
android:text="负责人" />
<TextView
android:id="@+id/tv_peo"
style="@style/company_content"
android:text="企业名称企业名称企业名称企业名称企业名称" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"

60
app/src/main/res/layout/activity_company_detail.xml
View File

@ -60,6 +60,51 @@
android:layout_marginTop="3dp"
android:background="@color/divider_line_color" />
<TextView
style="@style/company_name_title"
android:text="企业法人" />
<TextView
android:id="@+id/tv_com_p"
style="@style/company_content"
tools:text="企业法人" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="3dp"
android:background="@color/divider_line_color" />
<TextView
style="@style/company_name_title"
android:text="营业范围" />
<TextView
android:id="@+id/tv_scope"
style="@style/company_content"
tools:text="企业名称企业名称企业名称企业名称企业名称" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="3dp"
android:background="@color/divider_line_color" />
<TextView
style="@style/company_name_title"
android:text="组织机构代码" />
<TextView
android:id="@+id/tv_code"
style="@style/company_content"
tools:text="企业名称企业名称企业名称企业名称企业名称" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="3dp"
android:background="@color/divider_line_color" />
<TextView
style="@style/company_name_title"
android:text="省、自治区" />
@ -150,6 +195,21 @@
android:layout_marginTop="3dp"
android:background="@color/divider_line_color" />
<TextView
style="@style/company_name_title"
android:text="企业行业" />
<TextView
android:id="@+id/tv_trade_1"
style="@style/company_content"
android:text="企业名称企业名称企业名称企业名称企业名称" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="3dp"
android:background="@color/divider_line_color" />
<TextView
style="@style/company_name_title"
android:text="管理行业" />

141
app/src/main/res/layout/activity_company_info_edit.xml
View File

@ -9,7 +9,6 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="55dp"
android:overScrollMode="never"
android:scrollbars="none">
@ -64,6 +63,84 @@
tools:text="" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
<EditText
android:id="@+id/et_company_p"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="请输入企业法人"
android:padding="10dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
<EditText
android:id="@+id/et_company_code"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="请输入组织机构代码"
android:padding="10dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
<EditText
android:id="@+id/et_company_scope"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="请输入营业范围"
android:padding="10dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -79,6 +156,8 @@
android:id="@+id/tv_com_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true"
android:background="@drawable/shp_rectangle_gray"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:hint="请选择企业类型"
@ -103,6 +182,8 @@
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:clickable="true"
android:focusable="true"
android:hint="企业所属省、自治区"
android:padding="10dp"
android:textColor="@color/black" />
@ -125,6 +206,8 @@
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:clickable="true"
android:focusable="true"
android:hint="企业所属市"
android:padding="10dp"
android:textColor="@color/black" />
@ -148,6 +231,8 @@
android:background="@drawable/shp_rectangle_gray"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:hint="企业所属旗县区"
android:clickable="true"
android:focusable="true"
android:padding="10dp"
android:textColor="@color/black" />
</LinearLayout>
@ -170,6 +255,8 @@
android:drawableRight="@drawable/ic_arrow_gray_down"
android:hint="请选择所属街道"
android:padding="10dp"
android:clickable="true"
android:focusable="true"
android:textColor="@color/black" />
</LinearLayout>
@ -191,6 +278,8 @@
android:drawableRight="@drawable/ic_arrow_gray_down"
android:hint="请选择社区、村、嘎查"
android:padding="10dp"
android:clickable="true"
android:focusable="true"
android:textColor="@color/black" />
</LinearLayout>
@ -230,6 +319,36 @@
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
<TextView
android:id="@+id/tv_trade_1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:focusable="true"
android:gravity="left"
android:hint="请选择行业类型"
android:padding="10dp"
android:textColor="@color/black"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint"
android:visibility="invisible" />
<TextView
android:id="@+id/tv_trade"
android:layout_width="0dp"
@ -241,6 +360,8 @@
android:gravity="left"
android:hint="请选择管理行业"
android:padding="10dp"
android:clickable="true"
android:focusable="true"
android:textColor="@color/black"
android:textSize="15sp" />
@ -291,6 +412,8 @@
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:clickable="true"
android:focusable="true"
android:gravity="left"
android:hint="请选择风险作业"
android:padding="10dp"
@ -443,20 +566,4 @@
</android.support.v7.widget.CardView>
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/white">
<Button
android:id="@+id/btn_submit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/sel_btn_submit"
android:text="保存"
android:textColor="@color/white"
android:textSize="18sp" />
</LinearLayout>
</RelativeLayout>

122
app/src/main/res/layout/activity_company_lib.xml
View File

@ -4,92 +4,93 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/gray_bg"
android:orientation="vertical"
tools:context=".activitys.companylib.CompanyLibActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp">
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="40dp"
android:layout_margin="10dp"
android:layout_weight="1"
android:orientation="vertical">
<EditText
android:id="@+id/et_company_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="@string/hit_company_name"
android:padding="5dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
android:background="@drawable/shape_search_box"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_com_type"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:layout_weight="1.5"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:ellipsize="end"
android:focusable="true"
android:hint="请选择企业类型"
android:gravity="center_vertical"
android:hint="企业类型"
android:padding="5dp"
android:singleLine="true"
android:textColor="@color/black"
tools:text="单位类型" />
android:textFontWeight="1"
android:textSize="15sp"
tools:text="企业类型" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_margin="3dp"
android:background="@color/gray_bg" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="center"
android:orientation="horizontal">
<EditText
android:id="@+id/et_company_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_white"
android:drawableLeft="@color/line"
android:gravity="left"
android:hint="@string/hit_company_name"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
<ImageView
android:id="@+id/iv_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/ic_clear_edit" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<Button
android:id="@+id/btn_clear"
android:layout_width="60dp"
android:layout_height="30dp"
android:background="@drawable/sel_btn_submit_red"
android:padding="0dp"
android:text="清空"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_search"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_marginTop="3dp"
android:background="@drawable/sel_btn_submit"
android:padding="0dp"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<Button
android:id="@+id/btn_search"
android:layout_width="58dp"
android:layout_height="40dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/sel_btn_submit_no_size"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="@color/gray_bg" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp">
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
@ -125,8 +126,7 @@
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/xlv_com_lib"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
android:layout_height="wrap_content" />
</RelativeLayout>

122
app/src/main/res/layout/activity_counter_check_main.xml
View File

@ -4,92 +4,93 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/gray_bg"
android:orientation="vertical"
tools:context=".activitys.countercheck.CounterCheckMainActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp">
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="40dp"
android:layout_margin="8dp"
android:layout_weight="1"
android:orientation="vertical">
<EditText
android:id="@+id/et_company_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="@string/hit_company_name"
android:padding="5dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
android:background="@drawable/shape_search_box"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_com_type"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:layout_weight="1.5"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:ellipsize="end"
android:focusable="true"
android:hint="请选择企业类型"
android:gravity="center_vertical"
android:hint="企业类型"
android:padding="5dp"
android:singleLine="true"
android:textColor="@color/black"
tools:text="单位类型" />
android:textFontWeight="1"
android:textSize="15sp"
tools:text="企业类型" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_margin="3dp"
android:background="@color/gray_bg" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="center"
android:orientation="horizontal">
<EditText
android:id="@+id/et_company_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_white"
android:drawableLeft="@color/line"
android:gravity="left"
android:hint="@string/hit_company_name"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
<ImageView
android:id="@+id/iv_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/ic_clear_edit" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<Button
android:id="@+id/btn_clear"
android:layout_width="60dp"
android:layout_height="30dp"
android:background="@drawable/sel_btn_submit_red"
android:padding="0dp"
android:text="清空"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_search"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_marginTop="3dp"
android:background="@drawable/sel_btn_submit"
android:padding="0dp"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<Button
android:id="@+id/btn_search"
android:layout_width="58dp"
android:layout_height="40dp"
android:layout_marginRight="10dp"
android:background="@drawable/sel_btn_submit_no_size"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="@color/gray_bg" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp">
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
@ -125,8 +126,7 @@
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/xlv_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
android:layout_height="wrap_content" />
</RelativeLayout>
</LinearLayout>

123
app/src/main/res/layout/activity_counter_check_options.xml
View File

@ -3,64 +3,93 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:layout_height="wrap_content"
android:background="@color/gray"
android:orientation="vertical"
tools:context=".activitys.countercheck.CounterCheckOptionsActivity">
tools:context=".activitys.issue.CheckOptionsActivity">
<android.support.v7.widget.CardView
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
app:cardCornerRadius="10dp"
app:cardPreventCornerOverlap="true"
app:cardUseCompatPadding="false">
android:scrollbars="none">
<LinearLayout
android:id="@+id/ll_company_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
android:padding="5dp">
android:orientation="vertical">
<TextView
style="@style/company_name_title"
android:text="企业名称" />
<TextView
android:id="@+id/tv_name"
style="@style/company_content"
tools:text="企业名称企业名称企业名称企业名称企业名称" />
<TextView
style="@style/company_name_title"
android:text="主要负责人" />
<TextView
android:id="@+id/tv_peo"
style="@style/company_content"
android:text="企业名称企业名称企业名称企业名称企业名称" />
<Button
android:id="@+id/btn_unclaim"
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/sel_btn_submit"
android:text="企业不配合"
android:textColor="@color/white" />
android:layout_margin="8dp"
app:cardCornerRadius="10dp"
app:cardPreventCornerOverlap="true"
app:cardUseCompatPadding="false">
<LinearLayout
android:id="@+id/ll_company_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
android:padding="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
style="@style/company_name_title"
android:drawableLeft="@drawable/ic_item_user"
android:text="企业名称" />
<TextView
android:id="@+id/tv_name"
style="@style/company_content"
tools:text="企业名称企业名称企业名称企业名称企业名称" />
</LinearLayout>
<Button
android:id="@+id/btn_unclaim"
android:layout_width="wrap_content"
android:layout_height="27dp"
android:background="@drawable/sp_blue_sel"
android:text="企业不配合"
android:textColor="@color/titleBar" />
</LinearLayout>
<TextView
style="@style/company_name_title"
android:drawableLeft="@drawable/ic_item_idcard"
android:text="负责人" />
<TextView
android:id="@+id/tv_peo"
style="@style/company_content"
android:text="企业名称企业名称企业名称企业名称企业名称" />
</LinearLayout>
</android.support.v7.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_options"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layoutManager="LinearLayoutManager"
tools:listitem="@layout/item_options" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_options"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layoutManager="LinearLayoutManager"
tools:listitem="@layout/item_options" />
</android.support.v4.widget.NestedScrollView>
</LinearLayout>

174
app/src/main/res/layout/activity_enter_company_info.xml
View File

@ -3,13 +3,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="55dp"
android:overScrollMode="never"
android:scrollbars="none">
@ -64,6 +63,84 @@
tools:text="" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
<EditText
android:id="@+id/et_company_p"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="请输入企业法人"
android:padding="10dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
<EditText
android:id="@+id/et_company_code"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="请输入组织机构代码"
android:padding="10dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
<EditText
android:id="@+id/et_company_scope"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="请输入营业范围"
android:padding="10dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -80,9 +157,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:focusable="true"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:focusable="true"
android:hint="请选择企业类型"
android:padding="10dp"
android:textColor="@color/black" />
@ -104,9 +182,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:focusable="true"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:focusable="true"
android:hint="企业所属省、自治区"
android:padding="10dp"
android:textColor="@color/black" />
@ -127,10 +205,10 @@
android:id="@+id/tv_shi"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:clickable="true"
android:background="@drawable/shp_rectangle_gray"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:focusable="true"
android:hint="企业所属市"
android:padding="10dp"
android:textColor="@color/black" />
@ -152,9 +230,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:focusable="true"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:focusable="true"
android:hint="企业所属旗县区"
android:padding="10dp"
android:textColor="@color/black" />
@ -173,11 +251,11 @@
<TextView
android:id="@+id/tv_street"
android:layout_width="match_parent"
android:focusable="true"
android:clickable="true"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:focusable="true"
android:hint="请选择所属街道"
android:padding="10dp"
android:textColor="@color/black" />
@ -197,10 +275,10 @@
android:id="@+id/tv_community"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:clickable="true"
android:background="@drawable/shp_rectangle_gray"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:focusable="true"
android:hint="请选择社区、村、嘎查"
android:padding="10dp"
android:textColor="@color/black" />
@ -242,6 +320,36 @@
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint" />
<TextView
android:id="@+id/tv_trade_1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:focusable="true"
android:gravity="left"
android:hint="请选择行业类型"
android:padding="10dp"
android:textColor="@color/black"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_start_hint"
android:visibility="invisible" />
<TextView
android:id="@+id/tv_trade"
android:layout_width="0dp"
@ -249,9 +357,9 @@
android:layout_marginTop="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:focusable="true"
android:clickable="true"
android:gravity="left"
android:hint="请选择管理行业"
android:padding="10dp"
@ -304,10 +412,10 @@
android:layout_marginTop="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:gravity="left"
android:focusable="true"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:focusable="true"
android:gravity="left"
android:hint="请选择风险作业"
android:padding="10dp"
android:textColor="@color/black"
@ -409,8 +517,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_gray"
android:focusable="true"
android:clickable="true"
android:focusable="true"
android:padding="10dp"
android:text="厂区大门"
android:textColor="@color/black" />
@ -443,9 +551,9 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:clickable="true"
android:background="@drawable/shp_rectangle_gray"
android:clickable="true"
android:focusable="true"
android:padding="10dp"
android:text="主要作业场所"
android:textColor="@color/black" />
@ -464,19 +572,19 @@
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/white">
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:background="@color/white">-->
<Button
android:id="@+id/btn_submit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/sel_btn_submit"
android:text="录入"
android:textColor="@color/white"
android:textSize="18sp" />
</LinearLayout>
<!-- <Button-->
<!-- android:id="@+id/btn_submit"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:background="@drawable/sel_btn_submit"-->
<!-- android:text="录入"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="18sp" />-->
<!-- </LinearLayout>-->
</RelativeLayout>

122
app/src/main/res/layout/activity_history_list.xml
View File

@ -4,92 +4,93 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/gray_bg"
android:orientation="vertical"
tools:context=".activitys.companylib.CompanyLibActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp">
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="40dp"
android:layout_margin="10dp"
android:layout_weight="1"
android:orientation="vertical">
<EditText
android:id="@+id/et_company_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="@string/hit_company_name"
android:padding="5dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
android:background="@drawable/shape_search_box"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_com_type"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:layout_weight="1.5"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:ellipsize="end"
android:focusable="true"
android:hint="请选择企业类型"
android:gravity="center_vertical"
android:hint="企业类型"
android:padding="5dp"
android:singleLine="true"
android:textColor="@color/black"
tools:text="单位类型" />
android:textFontWeight="1"
android:textSize="15sp"
tools:text="企业类型" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_margin="3dp"
android:background="@color/gray_bg" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="center"
android:orientation="horizontal">
<EditText
android:id="@+id/et_company_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_white"
android:drawableLeft="@color/line"
android:gravity="left"
android:hint="@string/hit_company_name"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
<ImageView
android:id="@+id/iv_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/ic_clear_edit" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<Button
android:id="@+id/btn_clear"
android:layout_width="60dp"
android:layout_height="30dp"
android:background="@drawable/sel_btn_submit_red"
android:padding="0dp"
android:text="清空"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_search"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_marginTop="3dp"
android:background="@drawable/sel_btn_submit"
android:padding="0dp"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<Button
android:id="@+id/btn_search"
android:layout_width="58dp"
android:layout_height="40dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/sel_btn_submit_no_size"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="@color/gray_bg" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp">
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
@ -125,8 +126,7 @@
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/xlv_com_lib"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
android:layout_height="wrap_content" />
</RelativeLayout>

138
app/src/main/res/layout/activity_law_lib.xml
View File

@ -4,87 +4,87 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_gray"
android:background="@color/gray_bg"
android:orientation="vertical">
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="horizontal"-->
<!-- android:padding="10dp">-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="horizontal"-->
<!-- android:padding="10dp">-->
<!-- <EditText-->
<!-- android:id="@+id/et_law_name"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_weight="1"-->
<!-- android:background="@drawable/shp_rectangle_gray"-->
<!-- android:gravity="left"-->
<!-- android:hint="请输入法律法规名称"-->
<!-- android:padding="5dp"-->
<!-- android:textColor="@color/black"-->
<!-- android:textSize="15sp"-->
<!-- tools:text="" />-->
<!-- <EditText-->
<!-- android:id="@+id/et_law_name"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_weight="1"-->
<!-- android:background="@drawable/shp_rectangle_gray"-->
<!-- android:gravity="left"-->
<!-- android:hint="请输入法律法规名称"-->
<!-- android:padding="5dp"-->
<!-- android:textColor="@color/black"-->
<!-- android:textSize="15sp"-->
<!-- tools:text="" />-->
<!-- <Button-->
<!-- android:id="@+id/btn_search"-->
<!-- android:layout_width="60dp"-->
<!-- android:layout_height="30dp"-->
<!-- android:layout_margin="0dp"-->
<!-- android:background="@drawable/sel_btn_submit"-->
<!-- android:padding="0dp"-->
<!-- android:text="搜索"-->
<!-- android:textColor="@color/white" />-->
<!-- <Button-->
<!-- android:id="@+id/btn_search"-->
<!-- android:layout_width="60dp"-->
<!-- android:layout_height="30dp"-->
<!-- android:layout_margin="0dp"-->
<!-- android:background="@drawable/sel_btn_submit"-->
<!-- android:padding="0dp"-->
<!-- android:text="搜索"-->
<!-- android:textColor="@color/white" />-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginTop="5dp"-->
<!-- android:background="@color/gray_bg" />-->
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginTop="5dp"-->
<!-- android:background="@color/gray_bg" />-->
<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginTop="5dp">-->
<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginTop="5dp">-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerInParent="true"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical">-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerInParent="true"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical">-->
<!-- <ProgressBar-->
<!-- android:id="@+id/pb_loading"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:indeterminateBehavior="repeat"-->
<!-- android:indeterminateDrawable="@drawable/anim_loading" />-->
<!-- <ProgressBar-->
<!-- android:id="@+id/pb_loading"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:indeterminateBehavior="repeat"-->
<!-- android:indeterminateDrawable="@drawable/anim_loading" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_empty"-->
<!-- android:layout_width="100dp"-->
<!-- android:layout_height="100dp"-->
<!-- android:layout_centerInParent="true"-->
<!-- android:background="@drawable/ic_empty_data" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_empty"-->
<!-- android:layout_width="100dp"-->
<!-- android:layout_height="100dp"-->
<!-- android:layout_centerInParent="true"-->
<!-- android:background="@drawable/ic_empty_data" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_error_hint"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:clickable="true"-->
<!-- android:textColor="@color/black"-->
<!-- tools:text="加载数据失败" />-->
<!-- </LinearLayout>-->
<!-- <TextView-->
<!-- android:id="@+id/tv_error_hint"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:clickable="true"-->
<!-- android:textColor="@color/black"-->
<!-- tools:text="加载数据失败" />-->
<!-- </LinearLayout>-->
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/xlv_com_lib"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/xlv_com_lib"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
</LinearLayout>

26
app/src/main/res/layout/activity_main.xml
View File

@ -213,6 +213,32 @@
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/gray_line_ver" />
<LinearLayout
android:id="@+id/ll_history"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_history_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
android:textColor="#353535"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="历史任务"
android:textSize="10sp" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

123
app/src/main/res/layout/activity_mine_company_lib.xml
View File

@ -4,92 +4,92 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/gray_bg"
android:orientation="vertical"
tools:context=".activitys.companylib.CompanyLibActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp">
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="40dp"
android:layout_margin="10dp"
android:layout_weight="1"
android:orientation="vertical">
<EditText
android:id="@+id/et_company_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="@string/hit_company_name"
android:padding="5dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
android:background="@drawable/shape_search_box"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_com_type"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:layout_weight="1.5"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:ellipsize="end"
android:focusable="true"
android:hint="请选择企业类型"
android:gravity="center_vertical"
android:hint="企业类型"
android:padding="5dp"
android:singleLine="true"
android:textColor="@color/black"
tools:text="单位类型" />
android:textFontWeight="1"
android:textSize="15sp"
tools:text="企业类型" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_margin="3dp"
android:background="@color/gray_bg" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="center"
android:orientation="horizontal">
<EditText
android:id="@+id/et_company_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_white"
android:drawableLeft="@color/line"
android:gravity="left"
android:hint="@string/hit_company_name"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
<ImageView
android:id="@+id/iv_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/ic_clear_edit" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<Button
android:id="@+id/btn_clear"
android:layout_width="60dp"
android:layout_height="30dp"
android:background="@drawable/sel_btn_submit_red"
android:padding="0dp"
android:text="清空"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_search"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_marginTop="3dp"
android:background="@drawable/sel_btn_submit"
android:padding="0dp"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<Button
android:id="@+id/btn_search"
android:layout_width="58dp"
android:layout_height="40dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/sel_btn_submit_no_size"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="@color/gray_bg" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp">
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
@ -125,8 +125,7 @@
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/xlv_com_lib"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
android:layout_height="wrap_content" />
</RelativeLayout>

119
app/src/main/res/layout/activity_mine_mission_activity.xml
View File

@ -4,92 +4,93 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/gray_bg"
android:orientation="vertical"
tools:context=".activitys.companylib.CompanyLibActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp">
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="40dp"
android:layout_margin="10dp"
android:layout_weight="1"
android:orientation="vertical">
<EditText
android:id="@+id/et_company_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="@string/hit_company_name"
android:padding="5dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
android:background="@drawable/shape_search_box"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_com_type"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:layout_weight="1.5"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:ellipsize="end"
android:focusable="true"
android:hint="请选择企业类型"
android:gravity="center_vertical"
android:hint="企业类型"
android:padding="5dp"
android:singleLine="true"
android:textColor="@color/black"
tools:text="单位类型" />
android:textFontWeight="1"
android:textSize="15sp"
tools:text="企业类型" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_margin="3dp"
android:background="@color/gray_bg" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="center"
android:orientation="horizontal">
<EditText
android:id="@+id/et_company_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_white"
android:drawableLeft="@color/line"
android:gravity="left"
android:hint="@string/hit_company_name"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
<ImageView
android:id="@+id/iv_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/ic_clear_edit" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<Button
android:id="@+id/btn_clear"
android:layout_width="60dp"
android:layout_height="30dp"
android:background="@drawable/sel_btn_submit_red"
android:padding="0dp"
android:text="清空"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_search"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_marginTop="3dp"
android:background="@drawable/sel_btn_submit"
android:padding="0dp"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<Button
android:id="@+id/btn_search"
android:layout_width="58dp"
android:layout_height="40dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/sel_btn_submit_no_size"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="@color/gray_bg" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp">
>
<LinearLayout
android:layout_width="match_parent"

108
app/src/main/res/layout/activity_public_area.xml Normal file
View File

@ -0,0 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_bg"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/shape_search_box"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<EditText
android:id="@+id/et_company_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_white"
android:drawableLeft="@color/line"
android:gravity="left"
android:hint="@string/hit_company_name"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
<ImageView
android:id="@+id/iv_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/ic_clear_edit" />
</LinearLayout>
</LinearLayout>
<Button
android:id="@+id/btn_search"
android:layout_width="58dp"
android:layout_height="40dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/sel_btn_submit_no_size"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
android:orientation="vertical">
<ProgressBar
android:id="@+id/pb_loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading" />
<ImageView
android:id="@+id/iv_empty"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerInParent="true"
android:background="@drawable/ic_empty_data" />
<TextView
android:id="@+id/tv_error_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:clickable="true"
android:textColor="@color/black"
tools:text="加载数据失败" />
</LinearLayout>
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/xlv_public_list"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</RelativeLayout>
</LinearLayout>

21
app/src/main/res/layout/activity_public_report.xml Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activitys.issue.PublicReportActivity">
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</LinearLayout>

123
app/src/main/res/layout/activity_sel_company.xml
View File

@ -4,92 +4,92 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/gray_bg"
android:orientation="vertical"
tools:context=".activitys.companylib.CompanyLibActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp">
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="40dp"
android:layout_margin="10dp"
android:layout_weight="1"
android:orientation="vertical">
<EditText
android:id="@+id/et_company_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="@string/hit_company_name"
android:padding="5dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
android:background="@drawable/shape_search_box"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_com_type"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:layout_weight="1.5"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_gray_down"
android:ellipsize="end"
android:focusable="true"
android:hint="请选择企业类型"
android:gravity="center_vertical"
android:hint="企业类型"
android:padding="5dp"
android:singleLine="true"
android:textColor="@color/black"
tools:text="单位类型" />
android:textFontWeight="1"
android:textSize="15sp"
tools:text="企业类型" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_margin="3dp"
android:background="@color/gray_bg" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="center"
android:orientation="horizontal">
<EditText
android:id="@+id/et_company_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_white"
android:drawableLeft="@color/line"
android:gravity="left"
android:hint="@string/hit_company_name"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="" />
<ImageView
android:id="@+id/iv_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/ic_clear_edit" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<Button
android:id="@+id/btn_clear"
android:layout_width="60dp"
android:layout_height="30dp"
android:background="@drawable/sel_btn_submit_red"
android:padding="0dp"
android:text="清空"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_search"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_marginTop="3dp"
android:background="@drawable/sel_btn_submit"
android:padding="0dp"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<Button
android:id="@+id/btn_search"
android:layout_width="58dp"
android:layout_height="40dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/sel_btn_submit_no_size"
android:text="搜索"
android:textColor="@color/white" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="@color/gray_bg" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp">
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
@ -125,8 +125,7 @@
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/xlv_com_lib"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
android:layout_height="wrap_content" />
</RelativeLayout>

27
app/src/main/res/layout/item_company_check.xml
View File

@ -25,22 +25,25 @@
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="16sp"
tools:text="内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特" />
<TextView
android:id="@+id/tv_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="地址:内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特" />
<TextView
android:id="@+id/tv_peo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:textSize="12sp"
tools:text="负责人:张三" />
<TextView
android:id="@+id/tv_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:textSize="12sp"
tools:text="地址:内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特内蒙古呼和浩特" />
</LinearLayout>
<CheckBox
@ -50,12 +53,8 @@
android:button="@drawable/sel_check_blue"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false" />
android:focusableInTouchMode="false"
android:visibility="gone" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider_line_color" />
</LinearLayout>

98
app/src/main/res/layout/item_company_lib.xml
View File

@ -3,76 +3,76 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/sp_company_item_box"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingBottom="5dp">
android:padding="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingBottom="5dp">
android:orientation="vertical">
<LinearLayout
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:padding="10dp">
android:orientation="horizontal">
<TextView
android:id="@+id/tv_company_name"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="公司名称" />
android:textSize="16sp"
tools:text="公司名称公司名称公司名称公司名称公司名称公司名称公司名称" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<Button
android:id="@+id/btn_claim"
android:layout_width="71dp"
android:layout_height="27dp"
android:background="@drawable/sp_blue_sel"
android:text="认领企业"
android:textColor="@color/titleBar"
android:textSize="12sp"
android:visibility="visible" />
<Button
android:id="@+id/btn_unclaim"
android:layout_width="71dp"
android:layout_height="27dp"
android:background="@drawable/sp_red_sel"
android:text="解除认领"
android:textColor="#DE0E0E"
android:textSize="12sp"
android:visibility="gone" />
</RelativeLayout>
<TextView
android:id="@+id/tv_company_peo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="企业负责人:zhangsan" />
<TextView
android:id="@+id/tv_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址" />
</LinearLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_company_peo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:textSize="12sp"
tools:text="企业负责人:zhangsan" />
<Button
android:id="@+id/btn_claim"
android:layout_width="60dp"
android:layout_height="50dp"
android:background="@drawable/sel_btn_submit"
android:text="认领\n企业"
android:textColor="@color/white" />
<TextView
android:id="@+id/tv_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:textSize="12sp"
tools:text="地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址" />
<Button
android:id="@+id/btn_unclaim"
android:layout_width="60dp"
android:layout_height="50dp"
android:background="@drawable/sel_btn_submit_red"
android:text="解除\n认领"
android:textColor="@color/white"
android:visibility="gone" />
</RelativeLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="3dp"
android:background="@color/gray_line" />
</LinearLayout>

12
app/src/main/res/layout/item_counter_check.xml
View File

@ -3,8 +3,10 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@drawable/sp_company_item_box"
android:orientation="vertical"
android:padding="10dp">
android:padding="8dp">
<TextView
android:id="@+id/tv_name"
@ -18,17 +20,15 @@
android:id="@+id/tv_peo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="12sp"
android:visibility="invisible"
tools:text="负责人" />
<TextView
android:id="@+id/tv_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="12sp"
tools:text="地址" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="3dp"
android:background="@color/divider_line_color" />
</LinearLayout>

89
app/src/main/res/layout/item_counter_check_options.xml
View File

@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@drawable/sp_company_item_box"
android:orientation="vertical">
<LinearLayout
@ -31,16 +32,52 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="6"
android:layout_weight="1"
android:padding="5dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="测试数据" />
android:textSize="16sp"
tools:text="测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据" />
<com.sucstepsoft.txrealtimelocation.widget.StateCheckView
android:id="@+id/scv_options"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<RadioGroup
android:id="@+id/rg_state"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1.5"
android:gravity="center"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_state_uncheck"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
android:checked="true"
android:drawableLeft="@drawable/sel_rb"
android:text="未检查"
android:textSize="12sp" />
<RadioButton
android:id="@+id/rb_state_check"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
android:drawableLeft="@drawable/sel_rb"
android:text="合格"
android:textSize="12sp" />
<RadioButton
android:id="@+id/rb_state_dis"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
android:drawableLeft="@drawable/sel_rb"
android:text="存在隐患"
android:textSize="12sp" />
</RadioGroup>
</LinearLayout>
<View
@ -55,42 +92,51 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:gravity="center_vertical"
android:orientation="vertical">
android:orientation="horizontal">
<RadioGroup
android:id="@+id/rg_term"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_weight="1"
android:orientation="vertical">
<RadioButton
android:id="@+id/rb_now"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="8dp"
android:button="@null"
android:checked="true"
android:text="立即整改" />
android:drawableLeft="@drawable/sel_rb"
android:text="立即整改"
android:textSize="16sp" />
<RadioButton
android:id="@+id/rb_term"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="限期整改" />
android:layout_marginTop="8dp"
android:button="@null"
android:drawableLeft="@drawable/sel_rb"
android:text="限期整改"
android:textSize="16sp" />
<RadioButton
android:id="@+id/rb_coor"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="不配合" />
android:layout_marginTop="8dp"
android:button="@null"
android:drawableLeft="@drawable/sel_rb"
android:text="不配合"
android:textSize="16sp" />
</RadioGroup>
<LinearLayout
android:id="@+id/ll_sp"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:background="@drawable/sp_square_btn_blue_rim"
android:padding="2dp">
<android.support.v7.widget.AppCompatSpinner
@ -107,6 +153,7 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_photos"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_marginTop="5dp" />
</LinearLayout>
</LinearLayout>

85
app/src/main/res/layout/item_history.xml
View File

@ -3,16 +3,55 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/sp_company_item_box"
android:orientation="vertical"
android:padding="10dp">
android:padding="5dp">
<TextView
android:id="@+id/tv_name"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="16sp"
tools:text="名称" />
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="16sp"
tools:text="名称名称名称名称名称名称名称名称" />
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:textColor="@color/titleBar"
android:textSize="12sp"
tools:text="复查" />
</LinearLayout>
<TextView
android:id="@+id/tv_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/sp_blue_sel"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="5dp"
android:textColor="@color/titleBar"
android:textSize="12sp"
tools:text="当前状态" />
</LinearLayout>
<TextView
android:id="@+id/tv_peo"
@ -26,43 +65,9 @@
android:layout_height="wrap_content"
tools:text="地址" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:background="@drawable/shape_btn_green_sel"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="5dp"
android:textColor="@color/white"
android:textSize="12sp"
tools:text="当前状态" />
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_blue1"
android:textSize="12sp"
tools:text="复查" />
</RelativeLayout>
<TextView
android:id="@+id/tv_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="检查日期" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="3dp"
android:background="@color/divider_line_color" />
</LinearLayout>

8
app/src/main/res/layout/item_mission_detail.xml
View File

@ -13,27 +13,25 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="16sp"
tools:text="检查项名称" />
<TextView
android:id="@+id/tv_options_check"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="12sp"
tools:text="是否存在隐患" />
<TextView
android:id="@+id/tv_day"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="12sp"
tools:text="整改天数" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_photos"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider_line_color" />
</LinearLayout>

92
app/src/main/res/layout/item_options.xml
View File

@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@drawable/sp_company_item_box"
android:orientation="vertical">
<LinearLayout
@ -31,16 +32,52 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="6"
android:layout_weight="1"
android:padding="5dp"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="测试数据" />
android:textSize="16sp"
tools:text="测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据" />
<com.sucstepsoft.txrealtimelocation.widget.StateCheckView
android:id="@+id/scv_options"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<RadioGroup
android:id="@+id/rg_state"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1.5"
android:gravity="center"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_state_uncheck"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
android:checked="true"
android:drawableLeft="@drawable/sel_rb"
android:text="未检查"
android:textSize="12sp" />
<RadioButton
android:id="@+id/rb_state_check"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
android:drawableLeft="@drawable/sel_rb"
android:text="合格"
android:textSize="12sp" />
<RadioButton
android:id="@+id/rb_state_dis"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
android:drawableLeft="@drawable/sel_rb"
android:text="存在隐患"
android:textSize="12sp" />
</RadioGroup>
</LinearLayout>
<View
@ -55,44 +92,55 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:gravity="center_vertical"
android:orientation="vertical">
android:orientation="horizontal">
<RadioGroup
android:id="@+id/rg_term"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_weight="1"
android:orientation="vertical">
<RadioButton
android:id="@+id/rb_now"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="8dp"
android:button="@null"
android:checked="true"
android:text="立即整改" />
android:drawableLeft="@drawable/sel_rb"
android:text="立即整改"
android:textSize="16sp" />
<RadioButton
android:id="@+id/rb_term"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="限期整改" />
android:layout_marginTop="8dp"
android:button="@null"
android:drawableLeft="@drawable/sel_rb"
android:text="限期整改"
android:textSize="16sp" />
<RadioButton
android:id="@+id/rb_coor"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="不配合" />
android:layout_marginTop="8dp"
android:button="@null"
android:drawableLeft="@drawable/sel_rb"
android:text="不配合"
android:textSize="16sp" />
</RadioGroup>
<LinearLayout
android:id="@+id/ll_sp"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:background="@drawable/sp_square_btn_blue_rim"
android:orientation="vertical"
android:padding="2dp">
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/sp_term"
style="@style/common_spinner"
@ -101,12 +149,14 @@
android:popupTheme="@style/common_spinner"
android:spinnerMode="dropdown"
app:theme="@style/common_spinner" />
</LinearLayout>
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_photos"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_marginTop="5dp" />
</LinearLayout>
</LinearLayout>

1
app/src/main/res/layout/item_pop_text.xml
View File

@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:padding="5dp"
android:textColor="@color/black"

4
build.gradle
View File

@ -59,8 +59,8 @@ ext {
gCompileSdkVersion = 28
gMinSdkVersion = 16
gTargetSdkVersion = 28
gVersionCode = 3
gVersionName = '1.0.2'
gVersionCode = 4
gVersionName = '1.0.3'
// gVersionCode=26
// gVersionName='1.3.0'
//Router编译版本

1
cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
View File

@ -40,6 +40,7 @@ public class PathConfig {
public static final String APP_VERSION_ID = "cc0ef7f0-de0e-4e29-8428-534ab9f2494d";//下载AppID
public static final String DIC_COMPANY_TYPE_ID = "612415f3-0ebb-4bc2-b713-e9fb1acc7f76";//企业类型
public static final String DIC_TRADE_ID = "b97630ab-45b7-45bc-a624-507d4df952ff";//管理行业
public static final String DIC_TRADE_ID_1="b97630ab-45b7-45bc-a624-507d4df952ff";
public static final String DIC_RISK_ID = "77128e8e-3e09-45b5-a48e-7a50d1b7cc32";//风险
public static final String DIC_AREA_ID = "81583ade-5466-49aa-b7b6-c643c131ea34";//地区
public static final String NOTICE_TYPE_ID = "94d1691f-65e6-4c82-8537-98c4a318b09e";//通知公告

12
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
View File

@ -9,21 +9,17 @@ import com.sucstepsoft.cm_utils.constant.PathConfig;
*/
public class BaseUrlApi {
// public static final String IP = "http://58.18.22.25:8081/";/* 正式IP */
public static final String IP = "http://192.168.0.113:7001/usercenter/";/* 测试IP */
public static final String IP = "http://58.18.22.25:8081/usercenter/";/* 正式IP */
// public static final String IP = "http://192.168.0.113:7001/usercenter/";/* 测试IP */
public static final String PROJECT_NAME = "app/";
// public static final String BASE_URL = IP + PROJECT_NAME;
public static final String BASE_URL = IP + PROJECT_NAME;
public static final String APP_VERSION = BASE_URL + "appCmVersionManagement/getAppVersion";
public static final String PRISON_PLAN = BASE_URL + "appPlan/goPlan";
public static final String FIELD_SAFETY = BASE_URL + "appFieldSafety/goFloorPlan";
// http://39.104.74.123:8083
// http://39.104.74.123:8084/servicecity
public static final int PHOTO_REQUEST = 233;
public static final int CAMERA_REQUEST = 123;
// public static final String BASE_IP = "http://58.18.22.25:8081/servicecity/";/* 正式IP */
public static final String BASE_IP = "http://192.168.0.113:7006/inspection/";/* 测试IP */
// public static final String BASE_IP = "http://39.104.74.123:8084/servicecity/";/* 测试IP */
public static final String BASE_IP = "http://58.18.22.25:8082/inspection/";/* 正式IP */
// public static final String BASE_IP = "http://192.168.0.113:7006/inspection/";/* 测试IP */
public static final String BASE_IMG_URL = BASE_IP + "route/file/downloadfile/true/";
public static final String SOCKET_IP = "192.168.1.149";

6
cm_utils/src/main/res/drawable/shp_rectangle_white.xml Executable file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white" />
<corners android:radius="3dp" />
</shape>