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 2022-11-25 19:57:44 +08:00
parent 86f920f90f
commit 1b1212b5fa
28 changed files with 2046 additions and 1699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.idea/deploymentTargetDropDown.xml
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="586e3fe6" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-11-24T08:30:44.041994Z" />
</component>
</project>

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

@ -47,6 +47,20 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning"> tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".MsgDetailActivity"
android:exported="false">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".MsgListActivity"
android:exported="false">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity <activity
android:name=".activitys.trouble.MineMissionHistoryDetailActivity" android:name=".activitys.trouble.MineMissionHistoryDetailActivity"
android:launchMode="singleTop" android:launchMode="singleTop"
@ -279,9 +293,10 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".activitys.mine.UserActivity" android:name=".activitys.mine.UserActivity"
android:screenOrientation="portrait" /> <!-- <activity --> android:screenOrientation="portrait" />
<!-- android:name=".activitys.locus.LocusMapActivity" --> <activity
<!-- android:screenOrientation="portrait" /> --> android:name=".activitys.locus.LocusMapActivity"
android:screenOrientation="portrait" />
<activity <activity
android:name=".activitys.issue.IssueRecordActivity" android:name=".activitys.issue.IssueRecordActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
@ -361,7 +376,6 @@
<!-- <category android:name="${applicationId}" /> --> <!-- <category android:name="${applicationId}" /> -->
<!-- </intent-filter> --> <!-- </intent-filter> -->
<!-- </activity> --> <!-- </activity> -->
<meta-data <meta-data
android:name="BUGLY_APPID" android:name="BUGLY_APPID"
android:value="ff95776367" /> android:value="ff95776367" />
@ -382,11 +396,12 @@
<meta-data <meta-data
android:name="JPUSH_APPKEY" android:name="JPUSH_APPKEY"
android:value="${JPUSH_APPKEY}" /> <!-- 配置APP版本号 --> android:value="${JPUSH_APPKEY}" /> <!-- 配置APP版本号 -->
<!-- 配置APP渠道号 -->
<provider <provider
android:name=".services.GlobalProvider" android:name="com.sucstepsoft.cm_utils.core.GlobalProvider"
android:authorities="com.sucstepsoft.txrealtimelocation" android:authorities="com.sucstepsoft.txrealtimelocation"
android:enabled="true" android:enabled="true"
android:exported="true" /> <!-- 配置APP渠道号 --> android:exported="true" />
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="android.support.v4.content.FileProvider"
android:authorities="${applicationId}.provider" android:authorities="${applicationId}.provider"
@ -470,40 +485,7 @@
<intent-filter> <intent-filter>
<action android:name="com.sucstepsoft.txrealtimelocation.services.LocationHelperService" /> <action android:name="com.sucstepsoft.txrealtimelocation.services.LocationHelperService" />
</intent-filter> </intent-filter>
</service> <!-- since 3.3.0 Required SDK核心功能 --> </service>
<!-- <service-->
<!-- android:name="com.baidu.location.f"-->
<!-- android:enabled="true"-->
<!-- android:process=":remote" /> &lt;!&ndash; since 3.3.0 Required SDK 核心功能 &ndash;&gt;-->
<!-- 可配置android:process参数将PushService放在其他进程中 -->
<!-- User defined. For test only 继承自cn.jpush.android.service.JCommonService -->
<!-- <service -->
<!-- android:name="cn.jpush.android.service.PushService" -->
<!-- android:exported="false" -->
<!-- android:process=":pushcore"> -->
<!-- <intent-filter> -->
<!-- <action android:name="cn.jpush.android.intent.REGISTER" /> -->
<!-- <action android:name="cn.jpush.android.intent.REPORT" /> -->
<!-- <action android:name="cn.jpush.android.intent.PushService" /> -->
<!-- <action android:name="cn.jpush.android.intent.PUSH_TIME" /> -->
<!-- </intent-filter> -->
<!-- </service> &lt;!&ndash; Required . Enable it you can get statistics data with channel &ndash;&gt; -->
<!-- <service -->
<!-- android:name="cn.jpush.android.service.DaemonService" -->
<!-- android:enabled="true" -->
<!-- android:exported="true"> -->
<!-- <intent-filter> -->
<!-- <action android:name="cn.jpush.android.intent.DaemonService" /> -->
<!-- <category android:name="${applicationId}" /> -->
<!-- </intent-filter> -->
<!-- </service> -->
<!-- <service-->
<!-- android:name=".services.jpush.PushService"-->
<!-- android:process=":pushcore">-->
<!-- <intent-filter>-->
<!-- <action android:name="cn.jiguang.user.service.action" />-->
<!-- </intent-filter>-->
<!-- </service>-->
</application> </application>
</manifest> </manifest>

2
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/LoginActivity.java
View File

@ -22,6 +22,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.constant.PermissionConstants; import com.sucstepsoft.cm_utils.constant.PermissionConstants;
import com.sucstepsoft.cm_utils.core.GlobalProvider;
import com.sucstepsoft.cm_utils.core.network.update.CheckUpdateUtils; import com.sucstepsoft.cm_utils.core.network.update.CheckUpdateUtils;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
@ -37,7 +38,6 @@ import com.sucstepsoft.txrealtimelocation.beans.AppTokenUser;
import com.sucstepsoft.txrealtimelocation.beans.BaseUserBean; import com.sucstepsoft.txrealtimelocation.beans.BaseUserBean;
import com.sucstepsoft.txrealtimelocation.beans.LoginUser; import com.sucstepsoft.txrealtimelocation.beans.LoginUser;
import com.sucstepsoft.txrealtimelocation.net.LocationApiService; import com.sucstepsoft.txrealtimelocation.net.LocationApiService;
import com.sucstepsoft.txrealtimelocation.services.GlobalProvider;
import com.sucstepsoft.txrealtimelocation.utils.AesUtil; import com.sucstepsoft.txrealtimelocation.utils.AesUtil;
import com.sucstepsoft.txrealtimelocation.utils.ExceptionHandler; import com.sucstepsoft.txrealtimelocation.utils.ExceptionHandler;

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

@ -45,6 +45,7 @@ import com.sucstepsoft.txrealtimelocation.activitys.issue.IssueCheckActivity;
import com.sucstepsoft.txrealtimelocation.activitys.issue.MapActivity; import com.sucstepsoft.txrealtimelocation.activitys.issue.MapActivity;
import com.sucstepsoft.txrealtimelocation.activitys.issue.PublicAreaActivity; import com.sucstepsoft.txrealtimelocation.activitys.issue.PublicAreaActivity;
import com.sucstepsoft.txrealtimelocation.activitys.lawlib.LawLibActivity; import com.sucstepsoft.txrealtimelocation.activitys.lawlib.LawLibActivity;
import com.sucstepsoft.txrealtimelocation.activitys.locus.LocusMapActivity;
import com.sucstepsoft.txrealtimelocation.activitys.mine.MineMissionActivity; import com.sucstepsoft.txrealtimelocation.activitys.mine.MineMissionActivity;
import com.sucstepsoft.txrealtimelocation.activitys.mine.UserActivity; import com.sucstepsoft.txrealtimelocation.activitys.mine.UserActivity;
import com.sucstepsoft.txrealtimelocation.activitys.notice.NoticeActivity; import com.sucstepsoft.txrealtimelocation.activitys.notice.NoticeActivity;
@ -115,24 +116,27 @@ public class MainActivity extends BaseActivity {
@BindView(R.id.ll_plan) @BindView(R.id.ll_plan)
LinearLayout mLlPlan; LinearLayout mLlPlan;
private String[] permissions = new String[]{ private String[] permissions = new String[]{
PermissionConstants.STORAGE, PermissionConstants.STORAGE,
PermissionConstants.PHONE, PermissionConstants.PHONE,
PermissionConstants.MICROPHONE, PermissionConstants.MICROPHONE,
PermissionConstants.LOCATION PermissionConstants.LOCATION
}; };
private static final int GPS_REQUEST_CODE = 1234; private static final int GPS_REQUEST_CODE = 1234;
private Unbinder mBind; private Unbinder mBind;
private List<FuncBean> mFuncs = new ArrayList<>(); private List<FuncBean> mFuncs = new ArrayList<>();
private String[] mBtnStrs = new String[]{"我的企业\n(新增企业)", "企业检查", "隐患复查", "待办任务", "固定任务", "随机任务", "公共区域", "法律法规", "企业地图", "钉钉"}; private String[] mBtnStrs = new String[]{"我的企业\n(新增企业)", "企业检查", "隐患复查", "待办任务", "固定任务",
"随机任务", "公共区域", "法律法规", "企业地图", "工作轨迹", "钉钉"};
// 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, private int[] mBtnIds = new int[]{R.drawable.ic_main_c_info, R.drawable.ic_main_report,
R.drawable.ic_law, R.drawable.ic_main_risk,
R.drawable.ic_main_mine, R.drawable.ic_law,
R.drawable.ic_main_history, R.drawable.ic_main_mine,
R.drawable.ic_main_history, R.drawable.ic_main_history,
R.drawable.ic_main_law, R.drawable.ic_main_history,
R.drawable.ic_main_risk, R.drawable.ic_main_law,
R.drawable.ic_main_report}; R.drawable.ic_main_risk,
R.drawable.ic_main_risk,
R.drawable.ic_main_report};
private Gson mGson = null; private Gson mGson = null;
private AlertDialog mGpsWeakDialog; private AlertDialog mGpsWeakDialog;
private MessageReceiver mReceiver; private MessageReceiver mReceiver;
@ -185,72 +189,74 @@ public class MainActivity extends BaseActivity {
*/ */
private void getUserIsGrid() { private void getUserIsGrid() {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(LocationApiService.class) .create(LocationApiService.class)
.getGridInfo(UserLgUtils.getToken()) .getGridInfo(UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<GirdPBean>() { .subscribe(new Observer<GirdPBean>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
} }
@Override @Override
public void onNext(GirdPBean girdPBean) { public void onNext(GirdPBean girdPBean) {
if ("grid".equals(girdPBean.getPersonType())) { if ("grid".equals(girdPBean.getPersonType())) {
int isGridOperator = girdPBean.getIsGridOperator(); int isGridOperator = girdPBean.getIsGridOperator();
UserLgUtils.setIndustryId(isGridOperator); UserLgUtils.setIndustryId(isGridOperator);
} else { } else {
UserLgUtils.setIndustryId(-1); UserLgUtils.setIndustryId(-1);
Iterator<FuncBean> iterator = mFuncs.iterator(); Iterator<FuncBean> iterator = mFuncs.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
FuncBean bean = iterator.next(); FuncBean bean = iterator.next();
if ("隐患复查".equals(bean.getText())) { if ("隐患复查".equals(bean.getText())) {
iterator.remove(); iterator.remove();
}
}
mFunctionNumAdapter.setData(mFuncs);
}
UserLgUtils.setPersonType(girdPBean.getPersonType());
String page = getIntent().getStringExtra("page");
String serviceId = getIntent().getStringExtra("id");
if (!TextUtils.isEmpty(page)) {
switch (page) {
case "GO_CHECK2_INFO"://历史案件页面
startActivity(new Intent(mActivity, HistoryListActivity.class));
break;
case "GO_CHECK2_COMPLETE"://待办任务完成
if (!TextUtils.isEmpty(serviceId)) {
String[] split = serviceId.split(":");
Intent intent = new Intent(mActivity,
CaseCheckOptionsDetailActivity.class);
intent.putExtra("checkId", split[1]);
startActivity(intent);
}
break;
case "GO_CHECK2_HANDLE"://待办案件未完成
if (!TextUtils.isEmpty(serviceId)) {
String[] split = serviceId.split(":");
Intent intent = new Intent(mActivity,
CaseCheckOptionsActivity.class);
intent.putExtra("checkId", split[1]);
startActivity(intent);
}
break;
} }
} }
mFunctionNumAdapter.setData(mFuncs);
} }
UserLgUtils.setPersonType(girdPBean.getPersonType());
String page = getIntent().getStringExtra("page");
String serviceId = getIntent().getStringExtra("id");
if (!TextUtils.isEmpty(page)) { @Override
switch (page) { public void onError(Throwable e) {
case "GO_CHECK2_INFO"://历史案件页面 UserLgUtils.setIndustryId(-1);
startActivity(new Intent(mActivity, HistoryListActivity.class));
break;
case "GO_CHECK2_COMPLETE"://待办任务完成
if (!TextUtils.isEmpty(serviceId)) {
String[] split = serviceId.split(":");
Intent intent = new Intent(mActivity, CaseCheckOptionsDetailActivity.class);
intent.putExtra("checkId", split[1]);
startActivity(intent);
}
break;
case "GO_CHECK2_HANDLE"://待办案件未完成
if (!TextUtils.isEmpty(serviceId)) {
String[] split = serviceId.split(":");
Intent intent = new Intent(mActivity, CaseCheckOptionsActivity.class);
intent.putExtra("checkId", split[1]);
startActivity(intent);
}
break;
}
} }
}
@Override @Override
public void onError(Throwable e) { public void onComplete() {
UserLgUtils.setIndustryId(-1);
}
@Override }
public void onComplete() { });
}
});
} }
private void startLocation() { private void startLocation() {
@ -276,14 +282,14 @@ public class MainActivity extends BaseActivity {
*/ */
private void showNotifySettingPage() { private void showNotifySettingPage() {
new android.app.AlertDialog.Builder(MainActivity.this) new android.app.AlertDialog.Builder(MainActivity.this)
.setIcon(android.R.drawable.ic_dialog_info) .setIcon(android.R.drawable.ic_dialog_info)
.setTitle("提示") .setTitle("提示")
.setMessage("为了您能正常接收到系统消息通知,请前往设置页面,将App通知权限开启.") .setMessage("为了您能正常接收到系统消息通知,请前往设置页面,将App通知权限开启.")
.setNegativeButton("取消", null) .setNegativeButton("取消", null)
.setPositiveButton("立即前往", (dialogInterface, i) -> { .setPositiveButton("立即前往", (dialogInterface, i) -> {
NotificationUtils.toSettingPage(getApplicationContext()); NotificationUtils.toSettingPage(getApplicationContext());
}) })
.show(); .show();
} }
@ -347,6 +353,9 @@ public class MainActivity extends BaseActivity {
case "随机任务": case "随机任务":
intent = new Intent(this, RandomMissionActivity.class); intent = new Intent(this, RandomMissionActivity.class);
break; break;
case "工作轨迹":
intent= new Intent(this, LocusMapActivity.class);
break;
} }
if (intent != null) { if (intent != null) {
startActivity(intent); startActivity(intent);
@ -369,11 +378,11 @@ public class MainActivity extends BaseActivity {
} }
mTvUserName.setText(UserLgUtils.getName() + " 个人中心"); mTvUserName.setText(UserLgUtils.getName() + " 个人中心");
Glide.with(mActivity) Glide.with(mActivity)
.load(BaseUrlApi.BASE_IMG_URL + UserLgUtils.getAvatar()) .load(BaseUrlApi.BASE_IMG_URL + UserLgUtils.getAvatar())
.apply(RequestOptions.bitmapTransform(new CircleCrop()) .apply(RequestOptions.bitmapTransform(new CircleCrop())
.error(R.drawable.ic_user_default) .error(R.drawable.ic_user_default)
.placeholder(R.drawable.ic_user_default)) .placeholder(R.drawable.ic_user_default))
.into(mIvUserIcon); .into(mIvUserIcon);
// Glide.with(mActivity) // Glide.with(mActivity)
// .load(R.drawable.ic_nomal) // .load(R.drawable.ic_nomal)
// .into(mIvState); // .into(mIvState);
@ -391,147 +400,147 @@ public class MainActivity extends BaseActivity {
*/ */
private void getNumberByMine() { private void getNumberByMine() {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(LocationApiService.class) .create(LocationApiService.class)
.getArticleCount("94d1691f-65e6-4c82-8537-98c4a318b09e", UserLgUtils.getToken()) .getArticleCount("94d1691f-65e6-4c82-8537-98c4a318b09e", UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<BaseUserBean>() { .subscribe(new Observer<BaseUserBean>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
}
@Override
public void onNext(BaseUserBean baseUserBean) {
if (!TextUtils.isEmpty(baseUserBean.getData())) {
int i = Integer.parseInt(baseUserBean.getData());
if (i >= 100) {
mTvAvisoNum.setText("99+");
} else {
mTvAvisoNum.setText(baseUserBean.getData() + "");
}
} }
} @Override
public void onNext(BaseUserBean baseUserBean) {
if (!TextUtils.isEmpty(baseUserBean.getData())) {
int i = Integer.parseInt(baseUserBean.getData());
if (i >= 100) {
mTvAvisoNum.setText("99+");
} else {
mTvAvisoNum.setText(baseUserBean.getData() + "");
}
}
@Override }
public void onError(Throwable e) {
} @Override
public void onError(Throwable e) {
@Override }
public void onComplete() {
} @Override
}); public void onComplete() {
}
});
} }
private void getMineCurrentNum() { private void getMineCurrentNum() {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(LocationApiService.class) .create(LocationApiService.class)
.getPlanMineNum(UserLgUtils.getToken()) .getPlanMineNum(UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SuccCountBean>() { .subscribe(new Observer<SuccCountBean>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
}
@Override
public void onNext(SuccCountBean baseUserBean) {
refreshView(STATE_LOAD_SUCCESS);
if (baseUserBean != null && baseUserBean.getData() != null) {
mTvPlanNum.setText(baseUserBean.getData().getCheckPlanCount() + "");
} else {
mTvPlanNum.setText("0");
} }
}
@Override @Override
public void onError(Throwable e) { public void onNext(SuccCountBean baseUserBean) {
refreshView(STATE_LOAD_SUCCESS);
if (baseUserBean != null && baseUserBean.getData() != null) {
mTvPlanNum.setText(baseUserBean.getData().getCheckPlanCount() + "");
} else {
mTvPlanNum.setText("0");
}
}
} @Override
public void onError(Throwable e) {
@Override }
public void onComplete() {
} @Override
}); public void onComplete() {
}
});
} }
private void getNumberEnter() { private void getNumberEnter() {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(LocationApiService.class) .create(LocationApiService.class)
.getClaimedCount(UserLgUtils.getToken()) .getClaimedCount(UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<BaseUserBean>() { .subscribe(new Observer<BaseUserBean>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
}
@Override
public void onNext(BaseUserBean baseUserBean) {
if (!TextUtils.isEmpty(baseUserBean.getData())) {
int i = Integer.parseInt(baseUserBean.getData());
if (i >= 100) {
mTvMineIssueNum.setText("99+");
} else {
mTvMineIssueNum.setText(baseUserBean.getData() + "");
}
} }
} @Override
public void onNext(BaseUserBean baseUserBean) {
if (!TextUtils.isEmpty(baseUserBean.getData())) {
int i = Integer.parseInt(baseUserBean.getData());
if (i >= 100) {
mTvMineIssueNum.setText("99+");
} else {
mTvMineIssueNum.setText(baseUserBean.getData() + "");
}
}
@Override }
public void onError(Throwable e) {
} @Override
public void onError(Throwable e) {
@Override }
public void onComplete() {
} @Override
}); public void onComplete() {
}
});
} }
private void getNumberHistory() { private void getNumberHistory() {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(LocationApiService.class) .create(LocationApiService.class)
.getHistoryCount(UserLgUtils.getToken()) .getHistoryCount(UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<BaseUserBean>() { .subscribe(new Observer<BaseUserBean>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
}
@Override
public void onNext(BaseUserBean baseUserBean) {
if (!TextUtils.isEmpty(baseUserBean.getData())) {
int i = Integer.parseInt(baseUserBean.getData());
if (i >= 100) {
mTvHistoryNum.setText("99+");
} else {
mTvHistoryNum.setText(baseUserBean.getData() + "");
}
} }
} @Override
public void onNext(BaseUserBean baseUserBean) {
if (!TextUtils.isEmpty(baseUserBean.getData())) {
int i = Integer.parseInt(baseUserBean.getData());
if (i >= 100) {
mTvHistoryNum.setText("99+");
} else {
mTvHistoryNum.setText(baseUserBean.getData() + "");
}
}
@Override }
public void onError(Throwable e) {
} @Override
public void onError(Throwable e) {
@Override }
public void onComplete() {
} @Override
}); public void onComplete() {
}
});
} }
private AlertDialog mGpsSettingDialog; private AlertDialog mGpsSettingDialog;
@ -543,14 +552,14 @@ public class MainActivity extends BaseActivity {
private void openGpsSetting() { private void openGpsSetting() {
if (mGpsSettingDialog == null) { if (mGpsSettingDialog == null) {
mGpsSettingDialog = new AlertDialog.Builder(this).setTitle("打开GPS") mGpsSettingDialog = new AlertDialog.Builder(this).setTitle("打开GPS")
.setMessage("定位需要打开GPS,请前往设置") .setMessage("定位需要打开GPS,请前往设置")
.setNegativeButton("取消", (dialogInterface, i) -> dialogInterface.dismiss()) .setNegativeButton("取消", (dialogInterface, i) -> dialogInterface.dismiss())
.setPositiveButton("前往", (dialogInterface, i) -> { .setPositiveButton("前往", (dialogInterface, i) -> {
Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS); Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
startActivityForResult(intent, GPS_REQUEST_CODE); startActivityForResult(intent, GPS_REQUEST_CODE);
}) })
.setCancelable(false) .setCancelable(false)
.create(); .create();
} }
if (!mGpsSettingDialog.isShowing()) { if (!mGpsSettingDialog.isShowing()) {
mGpsSettingDialog.show(); mGpsSettingDialog.show();
@ -599,35 +608,36 @@ public class MainActivity extends BaseActivity {
*/ */
private void checkAppVersion() { private void checkAppVersion() {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(LocationApiService.class) .create(LocationApiService.class)
.doCheckAppVersion(PathConfig.APP_VERSION_ID, UserLgUtils.getToken()) .doCheckAppVersion(PathConfig.APP_VERSION_ID, UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<VersionBean>() { .subscribe(new Observer<VersionBean>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
} }
@Override @Override
public void onNext(VersionBean successBean) { public void onNext(VersionBean successBean) {
if (successBean != null && successBean.getData() > 0) { if (successBean != null && successBean.getData() > 0) {
if (CheckUpdateUtils.checkcode(MainActivity.this, successBean.getData() + "")) { if (CheckUpdateUtils.checkcode(MainActivity.this,
startDownloadApk(); successBean.getData() + "")) {
startDownloadApk();
}
} }
} }
}
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
@ -652,11 +662,11 @@ public class MainActivity extends BaseActivity {
* report 案件上报 * report 案件上报
*/ */
@OnClick({ @OnClick({
R.id.ll_mine_issue, R.id.ll_mine_issue,
R.id.ll_history, R.id.ll_history,
R.id.ll_plan, R.id.ll_plan,
R.id.ll_user_center, R.id.ll_user_center,
R.id.ll_day_aviso}) R.id.ll_day_aviso})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.ll_issue_dis://待办案件 case R.id.ll_issue_dis://待办案件
@ -689,11 +699,11 @@ public class MainActivity extends BaseActivity {
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
Glide.with(mActivity) Glide.with(mActivity)
.load(BaseUrlApi.BASE_IMG_URL + UserLgUtils.getAvatar()) .load(BaseUrlApi.BASE_IMG_URL + UserLgUtils.getAvatar())
.apply(RequestOptions.bitmapTransform(new CircleCrop()) .apply(RequestOptions.bitmapTransform(new CircleCrop())
.error(R.drawable.ic_user_default) .error(R.drawable.ic_user_default)
.placeholder(R.drawable.ic_user_default)) .placeholder(R.drawable.ic_user_default))
.into(mIvUserIcon); .into(mIvUserIcon);
} }
@Override @Override

2083
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/locus/LocusMapActivity.java
View File

File diff suppressed because it is too large Load Diff

2
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/mine/ChangePwdActivity.java
View File

@ -10,6 +10,7 @@ import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.sucstepsoft.cm_utils.core.GlobalProvider;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; 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.BaseActivity;
import com.sucstepsoft.cm_utils.utils.EncryptUtils; import com.sucstepsoft.cm_utils.utils.EncryptUtils;
@ -20,7 +21,6 @@ import com.sucstepsoft.txrealtimelocation.R;
import com.sucstepsoft.txrealtimelocation.beans.ChangePwdBean; import com.sucstepsoft.txrealtimelocation.beans.ChangePwdBean;
import com.sucstepsoft.txrealtimelocation.beans.SuccessBean; import com.sucstepsoft.txrealtimelocation.beans.SuccessBean;
import com.sucstepsoft.txrealtimelocation.net.LocationApiService; import com.sucstepsoft.txrealtimelocation.net.LocationApiService;
import com.sucstepsoft.txrealtimelocation.services.GlobalProvider;
import com.sucstepsoft.txrealtimelocation.utils.ExceptionHandler; import com.sucstepsoft.txrealtimelocation.utils.ExceptionHandler;
import butterknife.BindView; import butterknife.BindView;

38
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/mine/MsgDetailActivity.java Normal file
View File

@ -0,0 +1,38 @@
package com.sucstepsoft.txrealtimelocation.activitys.mine;
import com.sucstepsoft.cm_utils.core.beans.MessageBean;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.txrealtimelocation.R;
import butterknife.ButterKnife;
import butterknife.Unbinder;
/**
* 消息详情
*/
public class MsgDetailActivity extends BaseActivity {
private Unbinder mBind;
private MessageBean mBean;
@Override
protected int setLayoutId() {
return R.layout.activity_msg_detail;
}
@Override
public void initData() {
mBind = ButterKnife.bind(this);
mTvBaseTitle.setText("消息详情");
mBean = (MessageBean) getIntent().getSerializableExtra("bean");
if (mBean != null) {
setDataToView();
}
}
private void setDataToView() {
refreshView(STATE_LOAD_SUCCESS);
}
}

64
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/mine/MsgListActivity.java Normal file
View File

@ -0,0 +1,64 @@
package com.sucstepsoft.txrealtimelocation.activitys.mine;
import android.content.Intent;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.sucstepsoft.cm_utils.core.GlobalProvider;
import com.sucstepsoft.cm_utils.core.beans.MessageBean;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.txrealtimelocation.R;
import com.sucstepsoft.txrealtimelocation.adapters.MsgListAdapter;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
/**
* 消息列表
*/
public class MsgListActivity extends BaseActivity {
@BindView(R.id.rlv_msg)
RecyclerView mRlvMsg;
private Unbinder mBind;
private List<MessageBean> mData = new ArrayList<>();
private MsgListAdapter mAdapter;
@Override
protected int setLayoutId() {
return R.layout.activity_msg_list;
}
@Override
public void initData() {
mBind = ButterKnife.bind(this);
refreshView(STATE_LOAD_SUCCESS);
mTvBaseTitle.setText("通知消息");
mAdapter = new MsgListAdapter(this, mData);
mRlvMsg.setLayoutManager(new LinearLayoutManager(this));
mRlvMsg.setAdapter(mAdapter);
String socketMsg = GlobalProvider.getString(this, "socketMsg");
if (TextUtils.isEmpty(socketMsg)) {
refreshView(STATE_LOAD_EMPTY);
} else {
Gson gson = new Gson();
List<MessageBean> beans = gson.fromJson(socketMsg, new TypeToken<List<MessageBean>>() {
}.getType());
mData = beans;
mAdapter.setData(mData);
refreshView(STATE_LOAD_SUCCESS);
}
mAdapter.addOnItemClickListener(messageBean -> {
Intent intent = new Intent(MsgListActivity.this, MsgDetailActivity.class);
intent.putExtra("bean", messageBean);
startActivity(intent);
});
}
}

22
app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/mine/UserActivity.java
View File

@ -1,10 +1,7 @@
package com.sucstepsoft.txrealtimelocation.activitys.mine; package com.sucstepsoft.txrealtimelocation.activitys.mine;
import android.Manifest;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
@ -12,10 +9,8 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.provider.Settings; import android.provider.Settings;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.FileProvider; import android.support.v4.content.FileProvider;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Base64; import android.util.Base64;
import android.view.Gravity; import android.view.Gravity;
@ -32,6 +27,7 @@ import com.bumptech.glide.load.resource.bitmap.CircleCrop;
import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.RequestOptions;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.GlobalProvider;
import com.sucstepsoft.cm_utils.core.network.update.CheckUpdateUtils; import com.sucstepsoft.cm_utils.core.network.update.CheckUpdateUtils;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
@ -39,7 +35,6 @@ import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.core.widget.views.ButtomDialogView; import com.sucstepsoft.cm_utils.core.widget.views.ButtomDialogView;
import com.sucstepsoft.cm_utils.utils.AppUtils; import com.sucstepsoft.cm_utils.utils.AppUtils;
import com.sucstepsoft.cm_utils.utils.EncryptUtils; import com.sucstepsoft.cm_utils.utils.EncryptUtils;
import com.sucstepsoft.cm_utils.utils.FileIOUtils;
import com.sucstepsoft.cm_utils.utils.FileUtils; import com.sucstepsoft.cm_utils.utils.FileUtils;
import com.sucstepsoft.cm_utils.utils.LogUtils; import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.ProiderUtil; import com.sucstepsoft.cm_utils.utils.ProiderUtil;
@ -54,13 +49,10 @@ import com.sucstepsoft.txrealtimelocation.beans.LoginUser;
import com.sucstepsoft.txrealtimelocation.beans.SuccessBean; import com.sucstepsoft.txrealtimelocation.beans.SuccessBean;
import com.sucstepsoft.txrealtimelocation.beans.VersionBean; import com.sucstepsoft.txrealtimelocation.beans.VersionBean;
import com.sucstepsoft.txrealtimelocation.net.LocationApiService; import com.sucstepsoft.txrealtimelocation.net.LocationApiService;
import com.sucstepsoft.txrealtimelocation.services.GlobalProvider;
import com.sucstepsoft.txrealtimelocation.utils.AesUtil; import com.sucstepsoft.txrealtimelocation.utils.AesUtil;
import com.sucstepsoft.txrealtimelocation.utils.ExceptionHandler; import com.sucstepsoft.txrealtimelocation.utils.ExceptionHandler;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.UUID;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
@ -108,6 +100,8 @@ public class UserActivity extends BaseActivity {
RelativeLayout mRlLeaveCheck; RelativeLayout mRlLeaveCheck;
@BindView(R.id.rl_data_center) @BindView(R.id.rl_data_center)
RelativeLayout mRlDataCenter; RelativeLayout mRlDataCenter;
@BindView(R.id.rl_msg)
RelativeLayout mRlMsg;
private String mPicPath; private String mPicPath;
private Unbinder mBind; private Unbinder mBind;
@ -131,6 +125,7 @@ public class UserActivity extends BaseActivity {
mRlLeave.setOnClickListener(v -> choosePage(3)); mRlLeave.setOnClickListener(v -> choosePage(3));
mRlLeaveCheck.setOnClickListener(v -> choosePage(4)); mRlLeaveCheck.setOnClickListener(v -> choosePage(4));
mRlDataCenter.setOnClickListener(v -> choosePage(5)); mRlDataCenter.setOnClickListener(v -> choosePage(5));
mRlMsg.setOnClickListener(v -> choosePage(6));
String dirSize = FileUtils.getDirSize(PathConfig.PROJECT_CATCH_PATH); String dirSize = FileUtils.getDirSize(PathConfig.PROJECT_CATCH_PATH);
mTvCacheNum.setText(dirSize); mTvCacheNum.setText(dirSize);
mTvVersionNum.setText("v " + AppUtils.getAppVersionName()); mTvVersionNum.setText("v " + AppUtils.getAppVersionName());
@ -284,7 +279,8 @@ public class UserActivity extends BaseActivity {
@Override @Override
public void onSuccess(File file) { public void onSuccess(File file) {
RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file); RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
MultipartBody.Part body = MultipartBody.Part.createFormData("image", file.getName(), requestFile); MultipartBody.Part body = MultipartBody.Part.createFormData("image", file.getName(),
requestFile);
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(LocationApiService.class) .create(LocationApiService.class)
.uploadImage(body, UserLgUtils.getToken()) .uploadImage(body, UserLgUtils.getToken())
@ -407,7 +403,8 @@ public class UserActivity extends BaseActivity {
if (!TextUtils.isEmpty(baseUserBean.getData())) { if (!TextUtils.isEmpty(baseUserBean.getData())) {
byte[] decode = Base64.decode(baseUserBean.getData(), Base64.DEFAULT); byte[] decode = Base64.decode(baseUserBean.getData(), Base64.DEFAULT);
try { try {
String loginUserInfo = AesUtil.aesCommonDecoder(PathConfig.SECRET, new String(decode, "UTF-8")); String loginUserInfo = AesUtil.aesCommonDecoder(PathConfig.SECRET, new String(decode,
"UTF-8"));
LogUtils.e(loginUserInfo); LogUtils.e(loginUserInfo);
if (!TextUtils.isEmpty(loginUserInfo)) { if (!TextUtils.isEmpty(loginUserInfo)) {
AppTokenUser appTokenUser = gson.fromJson(loginUserInfo, AppTokenUser.class); AppTokenUser appTokenUser = gson.fromJson(loginUserInfo, AppTokenUser.class);
@ -573,6 +570,9 @@ public class UserActivity extends BaseActivity {
case 5: case 5:
startActivity(new Intent(UserActivity.this, StatisticsActivity.class)); startActivity(new Intent(UserActivity.this, StatisticsActivity.class));
break; break;
case 6:
startActivity(new Intent(UserActivity.this, MsgListActivity.class));
break;
} }
} }

36
app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/MsgListAdapter.java Executable file
View File

@ -0,0 +1,36 @@
package com.sucstepsoft.txrealtimelocation.adapters;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.sucstepsoft.cm_utils.core.beans.MessageBean;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.sucstepsoft.txrealtimelocation.R;
import com.sucstepsoft.txrealtimelocation.adapters.holders.MsgHolder;
import java.util.List;
/**
* 作者: Adam
* 日期: 2019/8/14 - 15:35
* 邮箱: itgaojian@163.com
* 描述:
*/
public class MsgListAdapter extends BaseRecyclerAdapter<MessageBean, MsgHolder> {
public MsgListAdapter(Context ctx, List<MessageBean> list) {
super(ctx, list);
}
@Override
public MsgHolder createHolder(ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_msg_list, parent, false);
return new MsgHolder(itemView);
}
@Override
public void bindHolder(MsgHolder h, int i) {
h.mTvTime.setText(mData.get(i).getTimestamp() + "");
}
}

19
app/src/main/java/com/sucstepsoft/txrealtimelocation/adapters/holders/MsgHolder.java Normal file
View File

@ -0,0 +1,19 @@
package com.sucstepsoft.txrealtimelocation.adapters.holders;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;
import com.sucstepsoft.txrealtimelocation.R;
public class MsgHolder extends RecyclerView.ViewHolder {
public TextView mTvTitle;
public TextView mTvTime;
public MsgHolder(@NonNull View itemView) {
super(itemView);
mTvTitle = itemView.findViewById(R.id.tv_title);
mTvTime = itemView.findViewById(R.id.tv_time);
}
}

96
app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/DrawMapLineBean.java
View File

@ -1,48 +1,48 @@
//package com.sucstepsoft.txrealtimelocation.beans; package com.sucstepsoft.txrealtimelocation.beans;
//
//import com.baidu.mapapi.model.LatLng; import com.baidu.mapapi.model.LatLng;
//
///** /**
// * 作者: Adam * 作者: Adam
// * 日期: 2019/8/29 - 17:34 * 日期: 2019/8/29 - 17:34
// * 邮箱: itgaojian@163.com * 邮箱: itgaojian@163.com
// * 描述: type 线的类型 12:移动 13:等待 14:异常 * 描述: type 线的类型 12:移动 13:等待 14:异常
// */ */
//public class DrawMapLineBean { public class DrawMapLineBean {
// private int type;//线的类型 private int type;//线的类型
// private LatLng onePoint; private LatLng onePoint;
// private LatLng twoPoint; private LatLng twoPoint;
// private Integer lineColor; private Integer lineColor;
//
// public int getType() { public int getType() {
// return type; return type;
// } }
//
// public void setType(int type) { public void setType(int type) {
// this.type = type; this.type = type;
// } }
//
// public LatLng getOnePoint() { public LatLng getOnePoint() {
// return onePoint; return onePoint;
// } }
//
// public void setOnePoint(LatLng onePoint) { public void setOnePoint(LatLng onePoint) {
// this.onePoint = onePoint; this.onePoint = onePoint;
// } }
//
// public LatLng getTwoPoint() { public LatLng getTwoPoint() {
// return twoPoint; return twoPoint;
// } }
//
// public void setTwoPoint(LatLng twoPoint) { public void setTwoPoint(LatLng twoPoint) {
// this.twoPoint = twoPoint; this.twoPoint = twoPoint;
// } }
//
// public Integer getLineColor() { public Integer getLineColor() {
// return lineColor; return lineColor;
// } }
//
// public void setLineColor(Integer lineColor) { public void setLineColor(Integer lineColor) {
// this.lineColor = lineColor; this.lineColor = lineColor;
// } }
//} }

84
app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/MineLocationBean.java
View File

@ -7,63 +7,19 @@ package com.sucstepsoft.txrealtimelocation.beans;
* 描述: * 描述:
*/ */
public class MineLocationBean implements Comparable<MineLocationBean> { public class MineLocationBean implements Comparable<MineLocationBean> {
private String actionPointId;
/**
* userLocationId : 32dcd59c-808b-4220-a586-68acb041b931
* userLongitude : 111.7705
* userLatitude : 40.871871
* userLocation : 中国内蒙古自治区呼和浩特市新城区科尔沁北路
* isOverstep : 0未越界，1越界 -1异常
* creator : 1
* gmtCreate : 2019-08-09 09:27:52
*/
private String userLocationId;
private String userLongitude;
private String userLatitude;
private String userLocation;
private String isOverstep;
private String creator; private String creator;
private String creatorName;
private String gmtCreate; private String gmtCreate;
private String lat;
private String lng;
public String getUserLocationId() { public String getActionPointId() {
return userLocationId; return actionPointId;
} }
public void setUserLocationId(String userLocationId) { public void setActionPointId(String actionPointId) {
this.userLocationId = userLocationId; this.actionPointId = actionPointId;
}
public String getUserLongitude() {
return userLongitude;
}
public void setUserLongitude(String userLongitude) {
this.userLongitude = userLongitude;
}
public String getUserLatitude() {
return userLatitude;
}
public void setUserLatitude(String userLatitude) {
this.userLatitude = userLatitude;
}
public String getUserLocation() {
return userLocation;
}
public void setUserLocation(String userLocation) {
this.userLocation = userLocation;
}
public String getIsOverstep() {
return isOverstep;
}
public void setIsOverstep(String isOverstep) {
this.isOverstep = isOverstep;
} }
public String getCreator() { public String getCreator() {
@ -74,6 +30,14 @@ public class MineLocationBean implements Comparable<MineLocationBean> {
this.creator = creator; this.creator = creator;
} }
public String getCreatorName() {
return creatorName;
}
public void setCreatorName(String creatorName) {
this.creatorName = creatorName;
}
public String getGmtCreate() { public String getGmtCreate() {
return gmtCreate; return gmtCreate;
} }
@ -82,6 +46,22 @@ public class MineLocationBean implements Comparable<MineLocationBean> {
this.gmtCreate = gmtCreate; this.gmtCreate = gmtCreate;
} }
public String getLat() {
return lat;
}
public void setLat(String lat) {
this.lat = lat;
}
public String getLng() {
return lng;
}
public void setLng(String lng) {
this.lng = lng;
}
@Override @Override
public int compareTo(MineLocationBean o) { public int compareTo(MineLocationBean o) {

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

@ -2,7 +2,6 @@ package com.sucstepsoft.txrealtimelocation.net;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.txrealtimelocation.beans.AddressListBean; import com.sucstepsoft.txrealtimelocation.beans.AddressListBean;
import com.sucstepsoft.txrealtimelocation.beans.AreaListBean; import com.sucstepsoft.txrealtimelocation.beans.AreaListBean;
import com.sucstepsoft.txrealtimelocation.beans.BaseDictionaryBean; import com.sucstepsoft.txrealtimelocation.beans.BaseDictionaryBean;
@ -62,7 +61,6 @@ import java.util.List;
import io.reactivex.Observable; import io.reactivex.Observable;
import okhttp3.MultipartBody; import okhttp3.MultipartBody;
import okhttp3.Request;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import retrofit2.http.Body; import retrofit2.http.Body;
import retrofit2.http.DELETE; import retrofit2.http.DELETE;
@ -103,7 +101,8 @@ public interface LocationApiService {
*/ */
@Headers({"Content-Type: application/json", "Accept: application/json"}) @Headers({"Content-Type: application/json", "Accept: application/json"})
@GET("appversion/getappversionnumber/{appVersionId}") @GET("appversion/getappversionnumber/{appVersionId}")
Observable<VersionBean> doCheckAppVersion(@Path("appVersionId") String appVersionId, @Header("token") String token); Observable<VersionBean> doCheckAppVersion(@Path("appVersionId") String appVersionId, @Header(
"token") String token);
@Headers({"Content-Type:application/json", "Accept:application/json"}) @Headers({"Content-Type:application/json", "Accept:application/json"})
@GET("user/getappuser") @GET("user/getappuser")
@ -192,7 +191,9 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict", "Content-Type:application/json", "Accept:application/json"}) @Headers({"base_url_name:dict", "Content-Type:application/json", "Accept:application/json"})
@GET("app/news/listpagenews/{newsType}") @GET("app/news/listpagenews/{newsType}")
Observable<NewsListBean> getNewsList(@Path("newsType") String newsType, @Query("rows") String rows, @Query("page") String page, @Header("token") String token); Observable<NewsListBean> getNewsList(@Path("newsType") String newsType,
@Query("rows") String rows, @Query("page") String page,
@Header("token") String token);
/** /**
* 获取下级部门和用户列表 * 获取下级部门和用户列表
@ -203,7 +204,8 @@ public interface LocationApiService {
*/ */
@Headers({"Content-Type: application/json", "Accept: application/json"}) @Headers({"Content-Type: application/json", "Accept: application/json"})
@GET("department/getsubdepartmentanduserlist") @GET("department/getsubdepartmentanduserlist")
Observable<AddressListBean> getDepartmentUsers(@Query("id") String id, @Header("token") String token); Observable<AddressListBean> getDepartmentUsers(@Query("id") String id,
@Header("token") String token);
/** /**
* 获取树 * 获取树
@ -214,8 +216,10 @@ public interface LocationApiService {
*/ */
@Headers({"Content-Type:application/json", "Accept:application/json"}) @Headers({"Content-Type:application/json", "Accept:application/json"})
@GET("department/listztreedepartments") @GET("department/listztreedepartments")
Observable<List<DepartmentBean>> getDepartmentList(@Query("id") String id, @Header("token") String token); Observable<List<DepartmentBean>> getDepartmentList(@Query("id") String id,
//==========================================================案件相关接口===================Start=================================================== @Header("token") String token);
//==========================================================案件相关接口===================Start
// ===================================================
/** /**
* 获取首页消息数量 * 获取首页消息数量
@ -230,11 +234,13 @@ public interface LocationApiService {
//地区的上级ID传：9d179f05-3ea0-48f7-853c-d3b7124b791c //地区的上级ID传：9d179f05-3ea0-48f7-853c-d3b7124b791c
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/dict/listdict/{dicParentId}") @GET("app/dict/listdict/{dicParentId}")
Observable<List<AreaListBean>> getDictList(@Path("dicParentId") String dicParentId, @Header("token") String token); Observable<List<AreaListBean>> getDictList(@Path("dicParentId") String dicParentId, @Header(
"token") String token);
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/dict/listdictall/{dictParentId}") @GET("app/dict/listdictall/{dictParentId}")
Observable<List<TypeListBean>> getDictListAll(@Path("dictParentId") String pId, @Header("token") String token); Observable<List<TypeListBean>> getDictListAll(@Path("dictParentId") String pId, @Header(
"token") String token);
/** /**
* 片长详情 * 片长详情
@ -246,7 +252,8 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/communityboss/listcommunitybossdetail/{areaId}/{communityBossParentId}") @GET("app/communityboss/listcommunitybossdetail/{areaId}/{communityBossParentId}")
Observable<List<PersonBean>> getListCommunityList(@Path("areaId") String areaId, @Path("communityBossParentId") String bossId, @Header("token") String token); Observable<List<PersonBean>> getListCommunityList(@Path("areaId") String areaId, @Path(
"communityBossParentId") String bossId, @Header("token") String token);
/** /**
* 获取小区列表 * 获取小区列表
@ -257,7 +264,8 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/community/listareacommunity/{areaId}") @GET("app/community/listareacommunity/{areaId}")
Observable<List<CommunityBean>> getCommunityList(@Path("areaId") String areaId, @Header("token") String token); Observable<List<CommunityBean>> getCommunityList(@Path("areaId") String areaId, @Header(
"token") String token);
/** /**
* 上传图片文件 * 上传图片文件
@ -270,7 +278,8 @@ public interface LocationApiService {
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@Multipart @Multipart
@POST("file/uploadimage") @POST("file/uploadimage")
Observable<BaseUserBean> uploadImage(@Part MultipartBody.Part file, @Header("token") String token); Observable<BaseUserBean> uploadImage(@Part MultipartBody.Part file,
@Header("token") String token);
/** /**
* 修改个人信息 * 修改个人信息
@ -281,7 +290,8 @@ public interface LocationApiService {
*/ */
@Headers({"Content-Type:application/json", "Accept:application/json"}) @Headers({"Content-Type:application/json", "Accept:application/json"})
@PUT("user/updateuserinfo") @PUT("user/updateuserinfo")
Observable<SuccessBean> doChangeUserInfo(@Body RequestBody userInfo, @Header("token") String token); Observable<SuccessBean> doChangeUserInfo(@Body RequestBody userInfo,
@Header("token") String token);
/** /**
* 修改密码 * 修改密码
@ -305,7 +315,8 @@ public interface LocationApiService {
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@Multipart @Multipart
@POST("file/uploadaudio") @POST("file/uploadaudio")
Observable<BaseUserBean> uploadVideo(@Part MultipartBody.Part file, @Header("token") String token); Observable<BaseUserBean> uploadVideo(@Part MultipartBody.Part file,
@Header("token") String token);
/** /**
* 上传音频文件 * 上传音频文件
@ -318,7 +329,8 @@ public interface LocationApiService {
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@Multipart @Multipart
@POST("file/uploadfile") @POST("file/uploadfile")
Observable<BaseUserBean> uploadFile(@Part MultipartBody.Part file, @Header("token") String token); Observable<BaseUserBean> uploadFile(@Part MultipartBody.Part file,
@Header("token") String token);
/** /**
* 保存案件上报 * 保存案件上报
@ -329,7 +341,8 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@POST("app/reportcase/savereportcase") @POST("app/reportcase/savereportcase")
Observable<SuccessBean> doReportIssue(@Body RequestBody IssueReportBody, @Header("token") String token); Observable<SuccessBean> doReportIssue(@Body RequestBody IssueReportBody,
@Header("token") String token);
/** /**
* 获取待下派列表 * 获取待下派列表
@ -341,7 +354,9 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/reportcase/listpagereportcaseassign") @GET("app/reportcase/listpagereportcaseassign")
Observable<IssueSubBean> getIssueSubList(@Query("rows") String rows, @Query("page") String page, @Header("token") String token); Observable<IssueSubBean> getIssueSubList(@Query("rows") String rows,
@Query("page") String page,
@Header("token") String token);
/** /**
* 获取待处理列表 * 获取待处理列表
@ -353,7 +368,9 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/reportcase/listpagereportcasehandle") @GET("app/reportcase/listpagereportcasehandle")
Observable<IssueSubBean> getIssueDisList(@Query("rows") String ros, @Query("page") String page, @Header("token") String token); Observable<IssueSubBean> getIssueDisList(@Query("rows") String ros,
@Query("page") String page,
@Header("token") String token);
/** /**
* 获取待检查列表 * 获取待检查列表
@ -365,11 +382,14 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/reportcase/listpagereportcaseinspect") @GET("app/reportcase/listpagereportcaseinspect")
Observable<IssueSubBean> getIssueInspectList(@Query("rows") String row, @Query("page") String page, @Header("token") String token); Observable<IssueSubBean> getIssueInspectList(@Query("rows") String row,
@Query("page") String page,
@Header("token") String token);
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/reportcase/getreportcase/{reportCaseId}") @GET("app/reportcase/getreportcase/{reportCaseId}")
Observable<Object> getIssueDetail(@Path("reportCaseId") String id, @Header("token") String token); Observable<Object> getIssueDetail(@Path("reportCaseId") String id,
@Header("token") String token);
//GET /app/reportcase/getreportcase/{reportCaseId} //GET /app/reportcase/getreportcase/{reportCaseId}
@ -383,7 +403,9 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/reportcase/listpagereportcaseclose") @GET("app/reportcase/listpagereportcaseclose")
Observable<IssueSubBean> getIssueCloseList(@Query("rows") String rows, @Query("page") String page, @Header("token") String token); Observable<IssueSubBean> getIssueCloseList(@Query("rows") String rows,
@Query("page") String page,
@Header("token") String token);
/** /**
* 获取案件归档列表 * 获取案件归档列表
@ -395,7 +417,10 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/reportcase/listpagereportcase") @GET("app/reportcase/listpagereportcase")
Observable<IssueSubBean> getIssueFinishList(@Query("caseStatus") String status, @Query("rows") String rows, @Query("page") String page, @Header("token") String token); Observable<IssueSubBean> getIssueFinishList(@Query("caseStatus") String status,
@Query("rows") String rows,
@Query("page") String page,
@Header("token") String token);
/** /**
* 保存处理案件 * 保存处理案件
@ -407,7 +432,9 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@POST("app/reportcase/savereportcasehandle/{caseId}") @POST("app/reportcase/savereportcasehandle/{caseId}")
Observable<SuccessBean> saveIssueDis(@Path("caseId") String caseId, @Body RequestBody requestBody, @Header("token") String token); Observable<SuccessBean> saveIssueDis(@Path("caseId") String caseId,
@Body RequestBody requestBody,
@Header("token") String token);
/** /**
* 保存案件检查 * 保存案件检查
@ -419,7 +446,9 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@POST("app/reportcase/savereportcaseinspect/{caseId}") @POST("app/reportcase/savereportcaseinspect/{caseId}")
Observable<SuccessBean> saveIssueInspect(@Path("caseId") String caseId, @Body RequestBody requestBody, @Header("token") String token); Observable<SuccessBean> saveIssueInspect(@Path("caseId") String caseId,
@Body RequestBody requestBody,
@Header("token") String token);
/** /**
* 我的待检查案件列表 * 我的待检查案件列表
@ -431,7 +460,9 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/reportcase/listpagereportcaseinspectofmine") @GET("app/reportcase/listpagereportcaseinspectofmine")
Observable<IssueSubBean> getMineInspectList(@Query("rows") String rows, @Query("page") String page, @Header("token") String token); Observable<IssueSubBean> getMineInspectList(@Query("rows") String rows,
@Query("page") String page,
@Header("token") String token);
/** /**
* 我的待处理 * 我的待处理
@ -443,7 +474,9 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/reportcase/listpagereportcasehandleofmine") @GET("app/reportcase/listpagereportcasehandleofmine")
Observable<IssueSubBean> getMineIssueDisList(@Query("rows") String ros, @Query("page") String page, @Header("token") String token); Observable<IssueSubBean> getMineIssueDisList(@Query("rows") String ros,
@Query("page") String page,
@Header("token") String token);
/** /**
@ -456,7 +489,9 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/reportcase/listpagetotalreportcasehandleofmine") @GET("app/reportcase/listpagetotalreportcasehandleofmine")
Observable<IssueSubBean> getMineTransactList(@Query("rows") String ros, @Query("page") String page, @Header("token") String token); Observable<IssueSubBean> getMineTransactList(@Query("rows") String ros,
@Query("page") String page,
@Header("token") String token);
/** /**
* 我的案件列表 * 我的案件列表
@ -468,7 +503,9 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/reportcase/listreportcaseofmine") @GET("app/reportcase/listreportcaseofmine")
Observable<IssueSubBean> getMineIssueList(@Query("rows") String rows, @Query("page") String page, @Header("token") String token); Observable<IssueSubBean> getMineIssueList(@Query("rows") String rows,
@Query("page") String page,
@Header("token") String token);
/** /**
* 获取案件流程 * 获取案件流程
@ -478,10 +515,13 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/reportcase/listreportcaselog/{caseId}") @GET("app/reportcase/listreportcaselog/{caseId}")
Observable<List<CaseFlowBean>> getCaseFlowList(@Path("caseId") String caseId, @Header("token") String token); Observable<List<CaseFlowBean>> getCaseFlowList(@Path("caseId") String caseId,
//==================================================案件相关接口====================End=================================================== @Header("token") String token);
//==================================================案件相关接口====================End
// ===================================================
//==================================================请假接口====================Start=================================================== //==================================================请假接口====================Start
// ===================================================
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@POST("app/leave/saveleave") @POST("app/leave/saveleave")
Observable<SuccessBean> saveLeave(@Body RequestBody leaveBody, @Header("token") String token); Observable<SuccessBean> saveLeave(@Body RequestBody leaveBody, @Header("token") String token);
@ -496,7 +536,9 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("app/leave/listpageleaveofmine") @GET("app/leave/listpageleaveofmine")
Observable<LeaveListBean> getLeaveListByMine(@Query("rows") String rows, @Query("page") String page, @Header("token") String token); Observable<LeaveListBean> getLeaveListByMine(@Query("rows") String rows,
@Query("page") String page,
@Header("token") String token);
/** /**
* 获取我的请假列表 * 获取我的请假列表
@ -508,11 +550,13 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("app/leave/listpageleaveofapproval") @GET("app/leave/listpageleaveofapproval")
Observable<LeaveListBean> getLeaveListByMineApproval(@Query("rows") String rows, @Query("page") String page, @Header("token") String token); Observable<LeaveListBean> getLeaveListByMineApproval(@Query("rows") String rows, @Query("page"
) String page, @Header("token") String token);
@Headers({"base_url_name:dict"}) @Headers({"base_url_name:dict"})
@GET("app/leave/getleave/{leaveId}") @GET("app/leave/getleave/{leaveId}")
Observable<LeaveDetailBean> getLeaveDetail(@Path("leaveId") String leaveId, @Header("token") String token); Observable<LeaveDetailBean> getLeaveDetail(@Path("leaveId") String leaveId,
@Header("token") String token);
/** /**
@ -523,11 +567,15 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict", "Content-Type:application/json", "Accept:application/json"}) @Headers({"base_url_name:dict", "Content-Type:application/json", "Accept:application/json"})
@PUT("app/leave/updateleaveofapproval/{leaveId}") @PUT("app/leave/updateleaveofapproval/{leaveId}")
Observable<SuccessBean> doCheckLeave(@Path("leaveId") String leaveid, @Body RequestBody checkBean, @Header("token") String token); Observable<SuccessBean> doCheckLeave(@Path("leaveId") String leaveid,
@Body RequestBody checkBean,
@Header("token") String token);
// PUT /api/leave/updateleaveofapproval/{leaveId} // PUT /api/leave/updateleaveofapproval/{leaveId}
// GET /app/leave/listpageleaveofapproval // GET /app/leave/listpageleaveofapproval
//==================================================请假接口====================End=================================================== //==================================================请假接口====================End
//==================================================定位相关接口====================Start=================================================== // ===================================================
//==================================================定位相关接口====================Start
// ===================================================
/** /**
* 上传定位坐标信息 * 上传定位坐标信息
@ -538,7 +586,8 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@POST("app/userlocation/saveuserlocation") @POST("app/userlocation/saveuserlocation")
Observable<SuccessBean> saveLocationData(@Body RequestBody locationPoint, @Header("token") String token); Observable<SuccessBean> saveLocationData(@Body RequestBody locationPoint,
@Header("token") String token);
/** /**
* 获取下属定位数据 * 获取下属定位数据
@ -550,7 +599,9 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict", "Content-Type:application/json", "Accept:application/json"}) @Headers({"base_url_name:dict", "Content-Type:application/json", "Accept:application/json"})
@GET("app/userlocation/listuserlocationbyuserid/{userId}") @GET("app/userlocation/listuserlocationbyuserid/{userId}")
Observable<List<UserocationBean>> getUnderlingLocationList(@Path("userId") String userId, @Query("showTime") String showTime, @Header("token") String token); Observable<List<UserocationBean>> getUnderlingLocationList(@Path("userId") String userId,
@Query("showTime") String showTime
, @Header("token") String token);
/** /**
* 获取人员列表 * 获取人员列表
@ -559,8 +610,10 @@ public interface LocationApiService {
* @return * @return
*/ */
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("app/userlocation/listuserlocationofmine") @GET("action/point/list")
Observable<List<MineLocationBean>> getUserLocationList(@Query("date") String date, @Query("startTime") String startTime, @Query("endTime") String endTime, @Header("token") String token); Observable<List<MineLocationBean>> getUserLocationList(@Query("startDate") String startTime,
@Query("endDate") String endTime,
@Header("token") String token);
/** /**
* 获取用户部门数据 * 获取用户部门数据
@ -602,9 +655,12 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("app/userlocation/listuserlocationofmine/{leaderType}/{isOnline}") @GET("app/userlocation/listuserlocationofmine/{leaderType}/{isOnline}")
Observable<List<UnderlingBean>> getMineLeaderList(@Path("leaderType") String leaderType, @Header("token") String token, @Path("isOnline") boolean isOnline); Observable<List<UnderlingBean>> getMineLeaderList(@Path("leaderType") String leaderType,
@Header("token") String token, @Path(
"isOnline") boolean isOnline);
//==================================================定位相关接口====================End=================================================== //==================================================定位相关接口====================End
// ===================================================
//============================================企业隐患上报=========================================== //============================================企业隐患上报===========================================
@ -614,78 +670,94 @@ public interface LocationApiService {
// GET /app/datadictionary/listdictionarybyparentid/{dictionaryParentId} // GET /app/datadictionary/listdictionarybyparentid/{dictionaryParentId}
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("datadictionary/listdictionarybyparentid/{dictionaryParentId}") @GET("datadictionary/listdictionarybyparentid/{dictionaryParentId}")
Observable<List<DictBean>> getDicrList(@Path("dictionaryParentId") String pId, @Header("token") String token); Observable<List<DictBean>> getDicrList(@Path("dictionaryParentId") String pId, @Header("token"
) String token);
//====================================================企业待认领========================================================== //====================================================企业待认领==========================================================
//获取待认领企业列表-全部 //获取待认领企业列表-全部
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterpriseofgridoperator/listpageunclaimedenterpriseofmine") @GET("enterpriseofgridoperator/listpageunclaimedenterpriseofmine")
Observable<CompanyListDataBean> getCompanyWaitList(@Query("page") String page, @Header("token") String token); Observable<CompanyListDataBean> getCompanyWaitList(@Query("page") String page, @Header("token"
) String token);
//获取待认领企业列表-关键字 //获取待认领企业列表-关键字
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterpriseofgridoperator/listpageunclaimedenterpriseofmine") @GET("enterpriseofgridoperator/listpageunclaimedenterpriseofmine")
Observable<CompanyListDataBean> getCompanyWaitListByName(@Query("page") String page, @Query("keywords") String name, @Header("token") String token); Observable<CompanyListDataBean> getCompanyWaitListByName(@Query("page") String page, @Query(
"keywords") String name, @Header("token") String token);
//获取待认领企业列表-类型 //获取待认领企业列表-类型
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterpriseofgridoperator/listpageunclaimedenterpriseofmine") @GET("enterpriseofgridoperator/listpageunclaimedenterpriseofmine")
Observable<CompanyListDataBean> getCompanyWaitListByType(@Query("page") String page, @Query("type") String type, @Header("token") String token); Observable<CompanyListDataBean> getCompanyWaitListByType(@Query("page") String page, @Query(
"type") String type, @Header("token") String token);
//获取待认领企业列表-名称和类型 //获取待认领企业列表-名称和类型
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterpriseofgridoperator/listpageunclaimedenterpriseofmine") @GET("enterpriseofgridoperator/listpageunclaimedenterpriseofmine")
Observable<CompanyListDataBean> getCompanyWaitListByAll(@Query("page") String page, @Query("keywords") String name, @Query("type") String type, @Header("token") String token); Observable<CompanyListDataBean> getCompanyWaitListByAll(@Query("page") String page, @Query(
"keywords") String name, @Query("type") String type, @Header("token") String token);
//获取企业列表 全部 //获取企业列表 全部
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorbyuserid/{userId}") @GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorbyuserid/{userId}")
Observable<CompanyListDataBean> getCompanyList(@Path("userId") String userId, @Query("page") String page, @Header("token") String token); Observable<CompanyListDataBean> getCompanyList(@Path("userId") String userId,
@Query("page") String page,
@Header("token") String token);
//获取企业列表 全部 //获取企业列表 全部
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorbyuserid/{userId}") @GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorbyuserid/{userId}")
Observable<CompanyListDataBean> getCompanyListByName(@Path("userId") String userId, @Query("page") String page, @Query("keywords") String name, @Header("token") String token); Observable<CompanyListDataBean> getCompanyListByName(@Path("userId") String userId, @Query(
"page") String page, @Query("keywords") String name, @Header("token") String token);
//获取企业列表 全部 //获取企业列表 全部
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorbyuserid/{userId}") @GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorbyuserid/{userId}")
Observable<CompanyListDataBean> getCompanyListByType(@Path("userId") String userId, @Query("page") String page, @Query("type") String type, @Header("token") String token); Observable<CompanyListDataBean> getCompanyListByType(@Path("userId") String userId, @Query(
"page") String page, @Query("type") String type, @Header("token") String token);
//获取企业列表 全部 //获取企业列表 全部
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorbyuserid/{userId}") @GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorbyuserid/{userId}")
Observable<CompanyListDataBean> getCompanyListByAll(@Path("userId") String userId, @Query("page") String page, @Query("keywords") String name, @Query("type") String type, @Header("token") String token); Observable<CompanyListDataBean> getCompanyListByAll(@Path("userId") String userId, @Query(
"page") String page, @Query("keywords") String name, @Query("type") String type,
@Header("token") String token);
//获取企业列表 我的-搜索 全部条件 //获取企业列表 我的-搜索 全部条件
//GET /app/enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine //GET /app/enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine") @GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine")
Observable<CompanyListDataBean> getCompanyListMineByAll(@Query("page") String page, @Query("keywords") String name, @Query("type") String type, @Header("token") String token); Observable<CompanyListDataBean> getCompanyListMineByAll(@Query("page") String page, @Query(
"keywords") String name, @Query("type") String type, @Header("token") String token);
//获取企业列表 我的-搜索 名称 //获取企业列表 我的-搜索 名称
//GET /app/enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine //GET /app/enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine") @GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine")
Observable<CompanyListDataBean> getCompanyListMineByName(@Query("page") String page, @Query("keywords") String name, @Header("token") String token); Observable<CompanyListDataBean> getCompanyListMineByName(@Query("page") String page, @Query(
"keywords") String name, @Header("token") String token);
//获取企业列表 我的-搜索 类型 //获取企业列表 我的-搜索 类型
//GET /app/enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine //GET /app/enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine") @GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine")
Observable<CompanyListDataBean> getCompanyListMineByType(@Query("page") String page, @Query("type") String type, @Header("token") String token); Observable<CompanyListDataBean> getCompanyListMineByType(@Query("page") String page, @Query(
"type") String type, @Header("token") String token);
//获取企业列表 我的 //获取企业列表 我的
//GET /app/enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine //GET /app/enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine") @GET("enterpriseofgridoperator/listpageenterpriseofgridoperatorofmine")
Observable<CompanyListDataBean> getCompanyListMine(@Query("page") String page, @Header("token") String token); Observable<CompanyListDataBean> getCompanyListMine(@Query("page") String page, @Header("token"
) String token);
//获取企业详情 //获取企业详情
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("enterprise/getenterprisebyid/{enterpriseId}") @GET("enterprise/getenterprisebyid/{enterpriseId}")
Observable<CompanyDetailBean> getCompanyDetail(@Path("enterpriseId") String page, @Header("token") String token); Observable<CompanyDetailBean> getCompanyDetail(@Path("enterpriseId") String page, @Header(
"token") String token);
//获取我的全部企业 //获取我的全部企业
//GET /app/enterprise/listenterpriseofmine //GET /app/enterprise/listenterpriseofmine
@ -696,19 +768,23 @@ public interface LocationApiService {
//企业信息录入 //企业信息录入
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@POST("enterprise/saveenterprise") @POST("enterprise/saveenterprise")
Observable<BaseUserBean> doSaveCompanyInfo(@Body RequestBody leaveBody, @Header("token") String token); Observable<BaseUserBean> doSaveCompanyInfo(@Body RequestBody leaveBody,
@Header("token") String token);
//企业信息修改 //企业信息修改
//PUT /app/enterprise/updateenterprise/{enterpriseId} //PUT /app/enterprise/updateenterprise/{enterpriseId}
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("enterprise/updateenterprise/{enterpriseId}") @PUT("enterprise/updateenterprise/{enterpriseId}")
Observable<SuccessBean> doEditCompanyInfo(@Body RequestBody leaveBody, @Path("enterpriseId") String id, @Header("token") String token); Observable<SuccessBean> doEditCompanyInfo(@Body RequestBody leaveBody,
@Path("enterpriseId") String id,
@Header("token") String token);
//获取检查项 //TODO 现在用的 //获取检查项 //TODO 现在用的
//industrycheckitem/listindustrycheckitem/{id} //industrycheckitem/listindustrycheckitem/{id}
// @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) // @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
// @GET("industrycheckitem/listindustrycheckitem") // @GET("industrycheckitem/listindustrycheckitem")
// Observable<List<CheckOptionsbean>> getCheckOptionsList(@Query("classifyId") String nId, @Header("token") String token); // Observable<List<CheckOptionsbean>> getCheckOptionsList(@Query("classifyId") String nId,
// @Header("token") String token);
// //
///GET /app/industrycheckitem/list-of-mine ///GET /app/industrycheckitem/list-of-mine
@ -720,18 +796,21 @@ public interface LocationApiService {
//GET /app/checkitemoption/listcheckitemoption //GET /app/checkitemoption/listcheckitemoption
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("checkitemoption/listcheckitemoption") @GET("checkitemoption/listcheckitemoption")
Observable<List<CheckItemOption>> getCheckItemOptionList(@Query("industryId") String id, @Header("token") String token); Observable<List<CheckItemOption>> getCheckItemOptionList(@Query("industryId") String id,
@Header("token") String token);
//保存检查结果 //保存检查结果
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@POST("check2/save") @POST("check2/save")
Observable<SuccessBean> doSaveOptions(@Body RequestBody leaveBody, @Header("token") String token); Observable<SuccessBean> doSaveOptions(@Body RequestBody leaveBody,
@Header("token") String token);
//绑定企业 //绑定企业
//enterpriseofgridoperator/saveenterpriseofgridoperator //enterpriseofgridoperator/saveenterpriseofgridoperator
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@POST("enterpriseofgridoperator/saveenterpriseofgridoperator") @POST("enterpriseofgridoperator/saveenterpriseofgridoperator")
Observable<SuccessBean> doBindCompany(@Body RequestBody leaveBody, @Header("token") String token); Observable<SuccessBean> doBindCompany(@Body RequestBody leaveBody,
@Header("token") String token);
//解除绑定企业 //解除绑定企业
//DELETE /app/enterpriseofgridoperator/removeenterpriseofgridoperator/{ids} //DELETE /app/enterpriseofgridoperator/removeenterpriseofgridoperator/{ids}
@ -743,22 +822,28 @@ public interface LocationApiService {
//复查列表 //复查列表
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-recheck-of-mine") @GET("check2/listpage-recheck-of-mine")
Observable<CounterCheckListBean> getCounterCheckList(@Query("page") String page, @Header("token") String token); Observable<CounterCheckListBean> getCounterCheckList(@Query("page") String page, @Header(
"token") String token);
//复查列表-name //复查列表-name
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-recheck-of-mine") @GET("check2/listpage-recheck-of-mine")
Observable<CounterCheckListBean> getCounterCheckListByName(@Query("page") String page, @Query("keywords") String name, @Header("token") String token); Observable<CounterCheckListBean> getCounterCheckListByName(@Query("page") String page,
@Query("keywords") String name,
@Header("token") String token);
//复查列表-type //复查列表-type
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-recheck-of-mine") @GET("check2/listpage-recheck-of-mine")
Observable<CounterCheckListBean> getCounterCheckListByType(@Query("page") String page, @Query("type") String type, @Header("token") String token); Observable<CounterCheckListBean> getCounterCheckListByType(@Query("page") String page,
@Query("type") String type,
@Header("token") String token);
//复查列表-all //复查列表-all
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-recheck-of-mine") @GET("check2/listpage-recheck-of-mine")
Observable<CounterCheckListBean> getCounterCheckListByAll(@Query("page") String page, @Query("keywords") String name, @Query("type") String type, @Header("token") String token); Observable<CounterCheckListBean> getCounterCheckListByAll(@Query("page") String page, @Query(
"keywords") String name, @Query("type") String type, @Header("token") String token);
//获取复查项列表 //获取复查项列表
//GET /app/check/listcheckitemunpassbycheckid/{checkId} //GET /app/check/listcheckitemunpassbycheckid/{checkId}
@ -769,85 +854,108 @@ public interface LocationApiService {
//保存复查结果 //保存复查结果
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@POST("check2/save-re/{checkId}") @POST("check2/save-re/{checkId}")
Observable<SuccessBean> doSaveCounterCheckOptions(@Body RequestBody leaveBody, @Path("checkId") String checkId, @Header("token") String token); Observable<SuccessBean> doSaveCounterCheckOptions(@Body RequestBody leaveBody, @Path("checkId"
) String checkId, @Header("token") String token);
//我的历史任务列表 //我的历史任务列表
//check/listpagecheckofmine //check/listpagecheckofmine
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-check-of-mine") @GET("check2/listpage-check-of-mine")
Observable<CounterCheckListBean> getMineCheckList(@Query("page") String page, @Header("token") String token); Observable<CounterCheckListBean> getMineCheckList(@Query("page") String page,
@Header("token") String token);
//历史任务-name //历史任务-name
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-check-of-mine") @GET("check2/listpage-check-of-mine")
Observable<CounterCheckListBean> getMineCheckListByName(@Query("page") String page, @Query("keywords") String name, @Header("token") String token); Observable<CounterCheckListBean> getMineCheckListByName(@Query("page") String page, @Query(
"keywords") String name, @Header("token") String token);
//历史任务-type //历史任务-type
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-check-of-mine") @GET("check2/listpage-check-of-mine")
Observable<CounterCheckListBean> getMineCheckListByType(@Query("page") String page, @Query("type") String type, @Header("token") String token); Observable<CounterCheckListBean> getMineCheckListByType(@Query("page") String page, @Query(
"type") String type, @Header("token") String token);
//历史任务-all //历史任务-all
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-check-of-mine") @GET("check2/listpage-check-of-mine")
Observable<CounterCheckListBean> getMineCheckListByAll(@Query("page") String page, @Query("keywords") String name, @Query("type") String type, @Header("token") String token); Observable<CounterCheckListBean> getMineCheckListByAll(@Query("page") String page, @Query(
"keywords") String name, @Query("type") String type, @Header("token") String token);
//我的历史任务列表 //我的历史任务列表
//check/listpagecheckofmine //check/listpagecheckofmine
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-check-of-mine") @GET("check2/listpage-check-of-mine")
Observable<CounterCheckListBean> getMineCheckListByMouth(@Query("page") String page, @Query("checkMonth") String mouth, @Query("checkType") String cType, @Header("token") String token); Observable<CounterCheckListBean> getMineCheckListByMouth(@Query("page") String page, @Query(
"checkMonth") String mouth, @Query("checkType") String cType,
@Header("token") String token);
//历史任务-name //历史任务-name
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-check-of-mine") @GET("check2/listpage-check-of-mine")
Observable<CounterCheckListBean> getMineCheckListByNameByMouth(@Query("page") String page, @Query("keywords") String name, @Query("checkMonth") String mouth, @Query("checkType") String cType, @Header("token") String token); Observable<CounterCheckListBean> getMineCheckListByNameByMouth(@Query("page") String page,
@Query("keywords") String name
, @Query("checkMonth") String mouth, @Query("checkType") String cType, @Header("token"
) String token);
//历史任务-type //历史任务-type
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-check-of-mine") @GET("check2/listpage-check-of-mine")
Observable<CounterCheckListBean> getMineCheckListByTypeByMouth(@Query("page") String page, @Query("type") String type, @Query("checkMonth") String mouth, @Query("checkType") String cType, @Header("token") String token); Observable<CounterCheckListBean> getMineCheckListByTypeByMouth(@Query("page") String page,
@Query("type") String type,
@Query("checkMonth") String mouth, @Query("checkType") String cType, @Header("token") String token);
//历史任务-all //历史任务-all
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-check-of-mine") @GET("check2/listpage-check-of-mine")
Observable<CounterCheckListBean> getMineCheckListByAllByMouth(@Query("page") String page, @Query("keywords") String name, @Query("type") String type, @Query("checkMonth") String mouth, @Query("checkType") String cType, @Header("token") String token); Observable<CounterCheckListBean> getMineCheckListByAllByMouth(@Query("page") String page,
@Query("keywords") String name,
@Query("type") String type,
@Query("checkMonth") String mouth, @Query("checkType") String cType, @Header("token") String token);
//历史任务详情 //历史任务详情
//check/getcheckbyid/{checkId} //check/getcheckbyid/{checkId}
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listcheckitembycheckid/{checkId}") @GET("check2/listcheckitembycheckid/{checkId}")
Observable<List<HistoryMissionBean>> getHistoryDetail(@Path("checkId") String checkId, @Header("token") String token); Observable<List<HistoryMissionBean>> getHistoryDetail(@Path("checkId") String checkId,
@Header("token") String token);
//历史任务详情 --- 新接口 //历史任务详情 --- 新接口
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/get/{checkId}") @GET("check2/get/{checkId}")
Observable<HistoryDetialBean> getHistoryDetailById(@Path("checkId") String checkId, @Header("token") String token); Observable<HistoryDetialBean> getHistoryDetailById(@Path("checkId") String checkId, @Header(
"token") String token);
//通知列表 //通知列表
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("articlecontent/listpagearticlecontent") @GET("articlecontent/listpagearticlecontent")
Observable<NoticeBean> getNoticeListById(@Query("articleCategoryId") String typeId, @Query("page") String page, @Header("token") String token); Observable<NoticeBean> getNoticeListById(@Query("articleCategoryId") String typeId, @Query(
"page") String page, @Header("token") String token);
//根据名称搜索通知 //根据名称搜索通知
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("articlecontent/listpagearticlecontent") @GET("articlecontent/listpagearticlecontent")
Observable<NoticeBean> getNoticeListByKeyWords(@Query("articleCategoryId") String typeId, @Query("page") String page, @Query("keywords") String keyWords, @Header("token") String token); Observable<NoticeBean> getNoticeListByKeyWords(@Query("articleCategoryId") String typeId,
@Query("page") String page,
@Query("keywords") String keyWords, @Header(
"token") String token);
//通知详情 //通知详情
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("articlecontent/getarticlecontentbyid/{articleContentId}") @GET("articlecontent/getarticlecontentbyid/{articleContentId}")
Observable<NoticeDetailBean> getNoticeDetailById(@Path("articleContentId") String id, @Header("token") String token); Observable<NoticeDetailBean> getNoticeDetailById(@Path("articleContentId") String id,
@Header("token") String token);
//获取通知公告数量 //获取通知公告数量
//getNumberByMine //getNumberByMine
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("articlecontent/countarticlecount") @GET("articlecontent/countarticlecount")
Observable<BaseUserBean> getArticleCount(@Query("articleCategoryId") String id, @Header("token") String token); Observable<BaseUserBean> getArticleCount(@Query("articleCategoryId") String id, @Header(
"token") String token);
//获取我的未认领企业数量 GET /app/enterpriseofgridoperator/countunclaimedenterpriseofmine //获取我的未认领企业数量 GET /app/enterpriseofgridoperator/countunclaimedenterpriseofmine
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@ -880,24 +988,29 @@ public interface LocationApiService {
//GET /app/taskcheck/listpagetaskcheckofmine //GET /app/taskcheck/listpagetaskcheckofmine
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("taskcheck/listpagetaskcheckofmine") @GET("taskcheck/listpagetaskcheckofmine")
Observable<MineMissionListBean> getCheckListOfMine(@Query("page") String page, @Header("token") String token); Observable<MineMissionListBean> getCheckListOfMine(@Query("page") String page, @Header("token"
) String token);
//我的任务 //我的任务
//GET /app/taskcheck/listpagetaskcheckofmine //GET /app/taskcheck/listpagetaskcheckofmine
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("taskcheck/listpagetaskcheckofmine") @GET("taskcheck/listpagetaskcheckofmine")
Observable<MineMissionListBean> getCheckListOfMineByName(@Query("keywords") String keyWords, @Query("page") String page, @Header("token") String token); Observable<MineMissionListBean> getCheckListOfMineByName(@Query("keywords") String keyWords,
@Query("page") String page, @Header(
"token") String token);
//复查公共隐患 //复查公共隐患
//PUT /app/publicareareport/updatepublicareareport/{publicAreaReportId} //PUT /app/publicareareport/updatepublicareareport/{publicAreaReportId}
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("publicareareport/updatepublicareareport/{publicAreaReportId}") @PUT("publicareareport/updatepublicareareport/{publicAreaReportId}")
Observable<SuccessBean> doUpdatePublicTrouble(@Body RequestBody leaveBody, @Path("publicAreaReportId") String id, @Header("token") String token); Observable<SuccessBean> doUpdatePublicTrouble(@Body RequestBody leaveBody, @Path(
"publicAreaReportId") String id, @Header("token") String token);
//保存公共隐患 //保存公共隐患
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@POST("publicareareport/savepublicareareport") @POST("publicareareport/savepublicareareport")
Observable<SuccessBean> doSavePublicTrouble(@Body RequestBody leaveBody, @Header("token") String token); Observable<SuccessBean> doSavePublicTrouble(@Body RequestBody leaveBody,
@Header("token") String token);
//获取公共隐患详情 //获取公共隐患详情
//GET /app/publicareareport/getpublicareareportbyid/{publicAreaReportId} //GET /app/publicareareport/getpublicareareportbyid/{publicAreaReportId}
@ -917,21 +1030,25 @@ public interface LocationApiService {
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
// @GET("publicareareport/listpagepublicareareportofmine") // @GET("publicareareport/listpagepublicareareportofmine")
@GET("publicareareport/listpagepublicareareportofmine") @GET("publicareareport/listpagepublicareareportofmine")
Observable<PublicTroubleListBean> getPublicTroubleList(@Query("page") String page, @Header("token") String token); Observable<PublicTroubleListBean> getPublicTroubleList(@Query("page") String page, @Header(
"token") String token);
//获取公共隐患记录日志 //获取公共隐患记录日志
//GET /app/publiclog/listpagepubliclog //GET /app/publiclog/listpagepubliclog
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("publiclog/listpubliclogbypublicareareportid/{publicAreaReportId}") @GET("publiclog/listpubliclogbypublicareareportid/{publicAreaReportId}")
Observable<List<PublicLogBean>> getPublicTroubleLogList(@Path("publicAreaReportId") String id, @Header("token") String token); Observable<List<PublicLogBean>> getPublicTroubleLogList(@Path("publicAreaReportId") String id
, @Header("token") String token);
//获取公共隐患列表-名称搜索 //获取公共隐患列表-名称搜索
//GET /app/publicareareport/listpagepublicareareportofmine //GET /app/publicareareport/listpagepublicareareportofmine
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("publicareareport/listpagepublicareareportofmine") @GET("publicareareport/listpagepublicareareportofmine")
Observable<PublicTroubleListBean> getPublicTroubleListByName(@Query("page") String page, @Query("keywords") String key, @Header("token") String token); Observable<PublicTroubleListBean> getPublicTroubleListByName(@Query("page") String page,
@Query("keywords") String key,
@Header("token") String token);
//保存计划 //保存计划
// POST /app/checkplan/savecheckplan // POST /app/checkplan/savecheckplan
@ -954,12 +1071,16 @@ public interface LocationApiService {
//保存NatureID //保存NatureID
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("enterprise/updateenterprisenature/{enterpriseId}") @PUT("enterprise/updateenterprisenature/{enterpriseId}")
Observable<SuccessBean> doSaveNatureId(@Body RequestBody nature, @Path("enterpriseId") String companyId, @Header("token") String token); Observable<SuccessBean> doSaveNatureId(@Body RequestBody nature,
@Path("enterpriseId") String companyId, @Header("token"
) String token);
//更新企业分类 //更新企业分类
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("enterprise/updateenterpriseclassify/{enterpriseId}") @PUT("enterprise/updateenterpriseclassify/{enterpriseId}")
Observable<SuccessBean> doSaveClassifyId(@Body RequestBody body, @Path("enterpriseId") String companyId, @Header("token") String token); Observable<SuccessBean> doSaveClassifyId(@Body RequestBody body,
@Path("enterpriseId") String companyId, @Header(
"token") String token);
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("count/countcurrentmonthofmine") @GET("count/countcurrentmonthofmine")
@ -969,106 +1090,134 @@ public interface LocationApiService {
//我的街道案件列表 //我的街道案件列表
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-street-of-mine") @GET("check2/listpage-street-of-mine")
Observable<CaseListBean> getMineStreetCaseList(@Query("page") String page, @Header("token") String token); Observable<CaseListBean> getMineStreetCaseList(@Query("page") String page,
@Header("token") String token);
//我的旗县区案件列表 //我的旗县区案件列表
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-district-of-mine") @GET("check2/listpage-district-of-mine")
Observable<CaseListBean> getMineDistrictCaseList(@Query("page") String page, @Header("token") String token); Observable<CaseListBean> getMineDistrictCaseList(@Query("page") String page,
@Header("token") String token);
//我的旗县区委办局案件列表 //我的旗县区委办局案件列表
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-district-department-of-mine") @GET("check2/listpage-district-department-of-mine")
Observable<CaseListBean> getMineDistrictDepartmentCaseList(@Query("page") String page, @Header("token") String token); Observable<CaseListBean> getMineDistrictDepartmentCaseList(@Query("page") String page,
@Header("token") String token);
//我的市案件列表 //我的市案件列表
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-city-of-mine") @GET("check2/listpage-city-of-mine")
Observable<CaseListBean> getMineCityCaseList(@Query("page") String page, @Header("token") String token); Observable<CaseListBean> getMineCityCaseList(@Query("page") String page,
@Header("token") String token);
/*历史列表*/ /*历史列表*/
//我的案件历史列表 //我的案件历史列表
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-history-of-mine") @GET("check2/listpage-history-of-mine")
Observable<CaseListBean> getMineHistoryStreetCaseList(@Query("page") String page, @Header("token") String token); Observable<CaseListBean> getMineHistoryStreetCaseList(@Query("page") String page, @Header(
"token") String token);
//我的旗县区历史列表 //我的旗县区历史列表
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-district-of-mine") @GET("check2/listpage-district-of-mine")
Observable<CaseListBean> getMineHistoryDistrictCaseList(@Query("page") String page, @Header("token") String token); Observable<CaseListBean> getMineHistoryDistrictCaseList(@Query("page") String page, @Header(
"token") String token);
//我的旗县区委办局历史列表 //我的旗县区委办局历史列表
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-district-department-of-mine") @GET("check2/listpage-district-department-of-mine")
Observable<CaseListBean> getMineHistoryDistrictDepartmentCaseList(@Query("page") String page, @Header("token") String token); Observable<CaseListBean> getMineHistoryDistrictDepartmentCaseList(@Query("page") String page,
@Header("token") String token);
//我的市历史列表 //我的市历史列表
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/listpage-city-of-mine") @GET("check2/listpage-city-of-mine")
Observable<CaseListBean> getMineHistoryCityCaseList(@Query("page") String page, @Header("token") String token); Observable<CaseListBean> getMineHistoryCityCaseList(@Query("page") String page, @Header(
"token") String token);
//获取案件详情 //获取案件详情
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/get/{checkId}") @GET("check2/get/{checkId}")
Observable<CaseDetailBean> getMineCaseDetailById(@Path("checkId") String id, @Header("token") String token); Observable<CaseDetailBean> getMineCaseDetailById(@Path("checkId") String id,
@Header("token") String token);
//街道案件完成 //街道案件完成
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("check2/update-street-complete/{checkId}") @PUT("check2/update-street-complete/{checkId}")
Observable<SuccessBean> doCompleteCaseStreet(@Body RequestBody body, @Path("checkId") String checkId, @Header("token") String token); Observable<SuccessBean> doCompleteCaseStreet(@Body RequestBody body,
@Path("checkId") String checkId,
@Header("token") String token);
//街道案件上级处理 //街道案件上级处理
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("check2/update-street-to-leader/{checkId}") @PUT("check2/update-street-to-leader/{checkId}")
Observable<SuccessBean> doSuperiorCaseStreet(@Body RequestBody body, @Path("checkId") String checkId, @Header("token") String token); Observable<SuccessBean> doSuperiorCaseStreet(@Body RequestBody body,
@Path("checkId") String checkId,
@Header("token") String token);
//旗县区案件回退 //旗县区案件回退
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("check2/update-district-back/{checkId}") @PUT("check2/update-district-back/{checkId}")
Observable<SuccessBean> doDistrictCaseBack(@Body RequestBody body, @Path("checkId") String checkId, @Header("token") String token); Observable<SuccessBean> doDistrictCaseBack(@Body RequestBody body,
@Path("checkId") String checkId,
@Header("token") String token);
//旗县区案件完成 //旗县区案件完成
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("check2/update-district-complete/{checkId}") @PUT("check2/update-district-complete/{checkId}")
Observable<SuccessBean> doDistrictCaseComplete(@Body RequestBody body, @Path("checkId") String checkId, @Header("token") String token); Observable<SuccessBean> doDistrictCaseComplete(@Body RequestBody body,
@Path("checkId") String checkId, @Header(
"token") String token);
//旗县区案件上报领导 //旗县区案件上报领导
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("check2/update-district-to-leader/{checkId}") @PUT("check2/update-district-to-leader/{checkId}")
Observable<SuccessBean> doDistrictCaseToLeader(@Body RequestBody body, @Path("checkId") String checkId, @Header("token") String token); Observable<SuccessBean> doDistrictCaseToLeader(@Body RequestBody body,
@Path("checkId") String checkId, @Header(
"token") String token);
//旗县区委办局案件回退 //旗县区委办局案件回退
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("check2/update-district-department-back/{checkId}") @PUT("check2/update-district-department-back/{checkId}")
Observable<SuccessBean> doDistrictDepartmentCaseBack(@Body RequestBody body, @Path("checkId") String checkId, @Header("token") String token); Observable<SuccessBean> doDistrictDepartmentCaseBack(@Body RequestBody body,
@Path("checkId") String checkId,
@Header("token") String token);
//旗县区委办局案件完成 //旗县区委办局案件完成
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("check2/update-district-department-complete/{checkId}") @PUT("check2/update-district-department-complete/{checkId}")
Observable<SuccessBean> doDistrictDepartmentCaseComplete(@Body RequestBody body, @Path("checkId") String checkId, @Header("token") String token); Observable<SuccessBean> doDistrictDepartmentCaseComplete(@Body RequestBody body, @Path(
"checkId") String checkId, @Header("token") String token);
//旗县区委办局案件回退 //旗县区委办局案件回退
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("check2/update-city-back/{checkId}") @PUT("check2/update-city-back/{checkId}")
Observable<SuccessBean> doCityCaseBack(@Body RequestBody body, @Path("checkId") String checkId, @Header("token") String token); Observable<SuccessBean> doCityCaseBack(@Body RequestBody body,
@Path("checkId") String checkId,
@Header("token") String token);
//旗县区委办局案件完成 //旗县区委办局案件完成
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@PUT("check2/update-city-complete/{checkId}") @PUT("check2/update-city-complete/{checkId}")
Observable<SuccessBean> doCityCaseComplete(@Body RequestBody body, @Path("checkId") String checkId, @Header("token") String token); Observable<SuccessBean> doCityCaseComplete(@Body RequestBody body,
@Path("checkId") String checkId,
@Header("token") String token);
//获取旗县区领导名单 //获取旗县区领导名单
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("gridpersonnel/list") @GET("gridpersonnel/list")
Observable<List<DistrictPersonBean>> getDistrictPersonList(@Query("personType") String type, @Header("token") String token); Observable<List<DistrictPersonBean>> getDistrictPersonList(@Query("personType") String type,
@Header("token") String token);
//案件日志 //案件日志
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("check2/list-check-log/{checkId}") @GET("check2/list-check-log/{checkId}")
Observable<List<LogListBean>> getCaseLogList(@Path("checkId") String checkId, @Header("token") String token); Observable<List<LogListBean>> getCaseLogList(@Path("checkId") String checkId,
@Header("token") String token);
/*============================随机任务==========================*/ /*============================随机任务==========================*/
/** /**
@ -1076,14 +1225,17 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("taskcheck/v1/listpagetaskcheckofmine") @GET("taskcheck/v1/listpagetaskcheckofmine")
Observable<MineMissionNewListBean> getMineMission(@Query("isCompleted") String isCompleted, @Query("page") String page, @Header("token") String token); Observable<MineMissionNewListBean> getMineMission(@Query("isCompleted") String isCompleted,
@Query("page") String page,
@Header("token") String token);
/** /**
* 新任务企业列表 * 新任务企业列表
*/ */
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("taskcheck/v1/listpagetaskenterpriseofmine/{taskId}") @GET("taskcheck/v1/listpagetaskenterpriseofmine/{taskId}")
Observable<CheckEnterpriseListBean> getMissionEnterpriseList(@Path("taskId") String taskId, @Query("isCompleted") String isCompleted, @Query("page") String page, @Header("token") String token); Observable<CheckEnterpriseListBean> getMissionEnterpriseList(@Path("taskId") String taskId,
@Query("isCompleted") String isCompleted, @Query("page") String page, @Header("token") String token);
/** /**
* 获取检查项 * 获取检查项
@ -1105,7 +1257,8 @@ public interface LocationApiService {
*/ */
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("taskcheck/v1/listtaskcheckreport/{checkItemListType}/{taskEnterpriseId}") @GET("taskcheck/v1/listtaskcheckreport/{checkItemListType}/{taskEnterpriseId}")
Observable<List<CheckEnterpriseHistoryBean>> getCheckEnterpriseHistoryDetail(@Path("checkItemListType") String checkItemListType, @Path("taskEnterpriseId") String taskEnterpriseId, @Header("token") String token); Observable<List<CheckEnterpriseHistoryBean>> getCheckEnterpriseHistoryDetail(@Path(
"checkItemListType") String checkItemListType, @Path("taskEnterpriseId") String taskEnterpriseId, @Header("token") String token);
} }

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 645 B

18
app/src/main/res/layout/activity_locus_map.xml
View File

@ -33,7 +33,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bm_btn_background" android:background="@drawable/bm_btn_background"
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" /> android:minHeight="0dp"
tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
<RadioGroup <RadioGroup
android:id="@+id/rg_map_type" android:id="@+id/rg_map_type"
@ -52,7 +53,8 @@
android:checked="true" android:checked="true"
android:padding="5dp" android:padding="5dp"
android:text="普通" android:text="普通"
android:textColor="@drawable/sel_btn_text_white_black" /> android:textColor="@drawable/sel_btn_text_white_black"
tools:ignore="TouchTargetSizeCheck,TextContrastCheck" />
<RadioButton <RadioButton
android:id="@+id/rb_satellite" android:id="@+id/rb_satellite"
@ -62,7 +64,8 @@
android:button="@null" android:button="@null"
android:padding="5dp" android:padding="5dp"
android:text="卫星" android:text="卫星"
android:textColor="@drawable/sel_btn_text_white_black" /> android:textColor="@drawable/sel_btn_text_white_black"
tools:ignore="TouchTargetSizeCheck" />
</RadioGroup> </RadioGroup>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
@ -122,7 +125,8 @@
android:paddingRight="40dp" android:paddingRight="40dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:text="地图" android:text="地图"
android:textColor="@drawable/sel_btn_text_white_black" /> android:textColor="@drawable/sel_btn_text_white_black"
tools:ignore="TouchTargetSizeCheck" />
<RadioButton <RadioButton
android:id="@+id/rb_text" android:id="@+id/rb_text"
@ -135,7 +139,8 @@
android:paddingRight="40dp" android:paddingRight="40dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:text="文本" android:text="文本"
android:textColor="@drawable/sel_btn_text_white_black" /> android:textColor="@drawable/sel_btn_text_white_black"
tools:ignore="TouchTargetSizeCheck" />
</RadioGroup> </RadioGroup>
<RelativeLayout <RelativeLayout
@ -150,7 +155,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_user_default" /> android:src="@drawable/ic_user_default"
tools:ignore="ImageContrastCheck" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"

9
app/src/main/res/layout/activity_msg_detail.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout 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.mine.MsgDetailActivity">
</android.support.constraint.ConstraintLayout>

14
app/src/main/res/layout/activity_msg_list.xml Normal file
View File

@ -0,0 +1,14 @@
<?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:orientation="vertical"
tools:context=".activitys.mine.MsgListActivity">
<android.support.v7.widget.RecyclerView
android:id="@+id/rlv_msg"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>

22
app/src/main/res/layout/activity_user.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -109,6 +108,27 @@
android:textSize="18sp" /> android:textSize="18sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:id="@+id/rl_msg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/sel_rectangle_btn_white_gray"
android:orientation="horizontal"
android:padding="14dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_msg_list"
android:drawablePadding="10dp"
android:text="通知消息"
android:textColor="@color/black"
android:textSize="18sp" />
</RelativeLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_change_pwd" android:id="@+id/ll_change_pwd"
android:layout_width="match_parent" android:layout_width="match_parent"

41
app/src/main/res/layout/item_msg_list.xml Executable file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@drawable/shape_rectangle_white"
android:orientation="horizontal"
android:padding="5dp"
tools:layout_height="60dp">
<ImageView
android:id="@+id/iv_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:background="@drawable/ic_msg_list" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_gravity="center_vertical"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/iv_icon"
android:gravity="center_vertical"
android:text="通知消息"
android:textColor="#ff353535"
android:textSize="18sp" />
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:text="2022-9-2 22:22:22"
android:textSize="16sp" />
</RelativeLayout>

2
app/src/main/java/com/sucstepsoft/txrealtimelocation/services/GlobalProvider.java → cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/GlobalProvider.java
View File

@ -1,4 +1,4 @@
package com.sucstepsoft.txrealtimelocation.services; package com.sucstepsoft.cm_utils.core;
import android.content.ContentProvider; import android.content.ContentProvider;
import android.content.ContentValues; import android.content.ContentValues;

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

@ -10,8 +10,9 @@ import com.sucstepsoft.cm_utils.constant.PathConfig;
public class BaseUrlApi { public class BaseUrlApi {
// public static final String IP = "http://1.180.60.42:8083/usercenter/";/* 正式IP */ // public static final String IP = "http://1.180.60.42:8083/usercenter/";/* 正式IP */
public static final String IP = "http://1.180.60.42:8084/usercenter/";/* 试用IP */ // public static final String IP = "http://1.180.60.42:8084/usercenter/";/* 试用IP */
// public static final String IP = "http://192.168.0.103:7001/usercenter/";/* 测试IP */ // public static final String IP = "http://192.168.0.103:7001/usercenter/";/* 测试IP */
public static final String IP = "http://49.233.36.36:58091/usercenter/";/* 测试IP */
public static final String PROJECT_NAME = "app/"; 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 APP_VERSION = BASE_URL + "appCmVersionManagement/getAppVersion";
@ -20,7 +21,8 @@ public class BaseUrlApi {
public static final int PHOTO_REQUEST = 233; public static final int PHOTO_REQUEST = 233;
public static final int CAMERA_REQUEST = 123; public static final int CAMERA_REQUEST = 123;
// public static final String BASE_IP = "http://1.180.60.42:8083/inspection/";/* 正式IP */ // public static final String BASE_IP = "http://1.180.60.42:8083/inspection/";/* 正式IP */
public static final String BASE_IP = "http://1.180.60.42:8084/inspection/";/* 试用IP */ // public static final String BASE_IP = "http://1.180.60.42:8084/inspection/";/* 试用IP */
public static final String BASE_IP = "http://49.233.36.36:58092/inspection/";/* 试用IP */
// public static final String BASE_IP = "http://192.168.0.103:7012/inspection/";/* 测试IP */ // public static final String BASE_IP = "http://192.168.0.103:7012/inspection/";/* 测试IP */
public static final String BASE_IMG_URL = BASE_IP + "route/file/downloadfile/true/"; public static final String BASE_IMG_URL = BASE_IP + "route/file/downloadfile/true/";
// public static final String SOCKET_IP = "http://192.168.0.103:7001/usercenter/ws";/*SocketIP测试*/ // public static final String SOCKET_IP = "http://192.168.0.103:7001/usercenter/ws";/*SocketIP测试*/

15
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java
View File

@ -5,12 +5,15 @@ import com.sucstepsoft.cm_utils.core.beans.DictionaryBean;
import com.sucstepsoft.cm_utils.core.beans.DistrictPersonBean; import com.sucstepsoft.cm_utils.core.beans.DistrictPersonBean;
import com.sucstepsoft.cm_utils.core.beans.UploadBean; import com.sucstepsoft.cm_utils.core.beans.UploadBean;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseResponseBean; import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseResponseBean;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseSuccessBean;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.VersionBean; import com.sucstepsoft.cm_utils.core.retrofit_net.bean.VersionBean;
import java.util.List; import java.util.List;
import io.reactivex.Observable; import io.reactivex.Observable;
import okhttp3.MultipartBody; import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import retrofit2.http.Body;
import retrofit2.http.Field; import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded; import retrofit2.http.FormUrlEncoded;
import retrofit2.http.GET; import retrofit2.http.GET;
@ -46,5 +49,15 @@ public interface BaseApiService {
//获取旗县区领导名单 //获取旗县区领导名单
@Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:dict", "Content-Type: application/json", "Accept: application/json"})
@GET("gridpersonnel/list") @GET("gridpersonnel/list")
Observable<List<DistrictPersonBean>> getDistrictPersonList(@Query("personType") String type, @Header("token") String token); Observable<List<DistrictPersonBean>> getDistrictPersonList(@Query("personType") String type,
@Header("token") String token);
/**
* 上传定位点
*/
@Headers({"base_url_name:dict", "Content-Type:application/json", "Accept:application/json"})
@POST("action/point/save")
Observable<BaseSuccessBean> doSaveLocation(@Body RequestBody location,
@Header("token") String token);
} }

11
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/bean/BaseSuccessBean.java Executable file
View File

@ -0,0 +1,11 @@
package com.sucstepsoft.cm_utils.core.retrofit_net.bean;
/**
* 作者: Adam
* 日期: 2019/8/5 - 14:35
* 邮箱: itgaojian@163.com
* 描述:
*/
public class BaseSuccessBean {
}

23
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/bean/SaveLocationBean.java Normal file
View File

@ -0,0 +1,23 @@
package com.sucstepsoft.cm_utils.core.retrofit_net.bean;
public class SaveLocationBean {
private String lat;
private String lng;
public String getLat() {
return lat;
}
public void setLat(String lat) {
this.lat = lat;
}
public String getLng() {
return lng;
}
public void setLng(String lng) {
this.lng = lng;
}
}

67
cm_utils/src/main/java/com/sucstepsoft/cm_utils/keeplive/services/BusinessService.java
View File

@ -21,11 +21,17 @@ import com.baidu.location.BDLocation;
import com.baidu.location.LocationClient; import com.baidu.location.LocationClient;
import com.baidu.location.LocationClientOption; import com.baidu.location.LocationClientOption;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.sucstepsoft.cm_utils.KeepLiveAidl; import com.sucstepsoft.cm_utils.KeepLiveAidl;
import com.sucstepsoft.cm_utils.R; import com.sucstepsoft.cm_utils.R;
import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.GlobalProvider;
import com.sucstepsoft.cm_utils.core.beans.MessageBean; import com.sucstepsoft.cm_utils.core.beans.MessageBean;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseSuccessBean;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.SaveLocationBean;
import com.sucstepsoft.cm_utils.core.sockets.AppSocketMessage; import com.sucstepsoft.cm_utils.core.sockets.AppSocketMessage;
import com.sucstepsoft.cm_utils.core.sockets.BaseSocketBodyBean; import com.sucstepsoft.cm_utils.core.sockets.BaseSocketBodyBean;
import com.sucstepsoft.cm_utils.core.sockets.SocketNoticeBean; import com.sucstepsoft.cm_utils.core.sockets.SocketNoticeBean;
@ -52,6 +58,9 @@ import io.reactivex.Observable;
import io.reactivex.Observer; import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.MediaType;
import okhttp3.RequestBody;
/** /**
* 作者: adam * 作者: adam
@ -346,10 +355,43 @@ public class BusinessService extends Service {
* 构建定位上传参数 * 构建定位上传参数
*/ */
private void buildUploadPoint() { private void buildUploadPoint() {
LogUtils.e("定位点数====" + mTempList.size() + "===");
if (mTempList.size() > 0) { if (mTempList.size() > 0) {
BDLocation bdLocation = mTempList.get(0); BDLocation bdLocation = mTempList.get(0);
LogUtils.e(bdLocation.getCityCode() + "===" + bdLocation.getLatitude() + "==" + bdLocation.getLongitude()); SaveLocationBean bean = new SaveLocationBean();
bean.setLat(bdLocation.getLatitude() + "");
bean.setLng(bdLocation.getLongitude() + "");
Gson gson = new Gson();
String obj = gson.toJson(bean);
RequestBody body =
RequestBody.create(MediaType.parse("application/json;charset" + "=utf-8"), obj);
RetrofitManager.getInstance()
.create(BaseApiService.class).doSaveLocation(body,
UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<BaseSuccessBean>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(BaseSuccessBean baseSuccessBean) {
LogUtils.e("上传成功");
mTempList.clear();
}
@Override
public void onError(Throwable e) {
e.printStackTrace();
LogUtils.e("上传失败");
}
@Override
public void onComplete() {
}
});
} }
} }
@ -458,7 +500,7 @@ public class BusinessService extends Service {
LogUtils.e(data); LogUtils.e(data);
JSONObject jsonObject = new JSONObject(data); JSONObject jsonObject = new JSONObject(data);
String from = jsonObject.getString("from"); String from = jsonObject.getString("from");
saveLocalDatabase(data);
int type = jsonObject.getInt("type"); int type = jsonObject.getInt("type");
//系统消息 //系统消息
switch (type) { switch (type) {
@ -479,7 +521,7 @@ public class BusinessService extends Service {
msgIntent.setAction(PathConfig.ACTION_MSG_CHAT); msgIntent.setAction(PathConfig.ACTION_MSG_CHAT);
msgIntent.putExtra(PathConfig.KEY_MSG_FROM, data); msgIntent.putExtra(PathConfig.KEY_MSG_FROM, data);
sendBroadcast(msgIntent); sendBroadcast(msgIntent);
saveLocalDatabase(data); // saveLocalDatabase(data);
break; break;
case PathConfig.MSG_UPCOMING: case PathConfig.MSG_UPCOMING:
//待办通知 //待办通知
@ -526,7 +568,8 @@ public class BusinessService extends Service {
*/ */
private String buildSocketMsg(int type, String system, String serviceId) { private String buildSocketMsg(int type, String system, String serviceId) {
String filePath = String filePath =
getApplicationContext().getExternalFilesDir("Cache").getAbsolutePath() + File.separator + "identity.txt"; getApplicationContext().getExternalFilesDir("Cache").getAbsolutePath() + File.separator + "identity" +
".txt";
File file = new File(filePath); File file = new File(filePath);
AppSocketMessage message = new AppSocketMessage(); AppSocketMessage message = new AppSocketMessage();
message.setType(type); message.setType(type);
@ -559,7 +602,19 @@ public class BusinessService extends Service {
* 聊天信息保存到本地数据库 * 聊天信息保存到本地数据库
*/ */
private void saveLocalDatabase(String data) { private void saveLocalDatabase(String data) {
String socketMsg = GlobalProvider.getString(this, "socketMsg");
if (TextUtils.isEmpty(socketMsg)) {
GlobalProvider.save(this, "socketMsg", data);
} else {
Gson gson = new Gson();
List<MessageBean> beans = gson.fromJson(socketMsg, new TypeToken<List<MessageBean>>() {
}.getType());
MessageBean b = gson.fromJson(data, new TypeToken<MessageBean>() {
}.getType());
beans.add(b);
String s = gson.toJson(beans);
GlobalProvider.save(this, "socketMsg", s);
}
} }
/** /**

150
cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/TimeUtils.java
View File

@ -1,6 +1,5 @@
package com.sucstepsoft.cm_utils.utils; package com.sucstepsoft.cm_utils.utils;
import android.service.quicksettings.Tile;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import com.sucstepsoft.cm_utils.constant.TimeConstants; import com.sucstepsoft.cm_utils.constant.TimeConstants;
@ -145,17 +144,11 @@ public final class TimeUtils {
return null; return null;
} }
// public static String getHMStr(String orgTime) { public static String getNowStr() {
// Date date = null; String date = null;
// try { date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
// date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(orgTime); return date;
// String newString = new SimpleDateFormat("HH:mm").format(date); //09:00 }
// return newString;
// } catch (ParseException e) {
// e.printStackTrace();
// return "异常";
// }
// }
/** /**
* 秒转换小时-分-秒 * 秒转换小时-分-秒
@ -276,8 +269,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the time span, in unit * @return the time span, in unit
*/ */
public static long getTimeSpan(final String time1, public static long getTimeSpan(final String time1, final String time2,
final String time2,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return getTimeSpan(time1, time2, getDefaultFormat(), unit); return getTimeSpan(time1, time2, getDefaultFormat(), unit);
} }
@ -383,8 +375,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the time span, in unit * @return the time span, in unit
*/ */
public static long getTimeSpan(final String time1, public static long getTimeSpan(final String time1, final String time2,
final String time2,
@NonNull final DateFormat format, @NonNull final DateFormat format,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return millis2TimeSpan(string2Millis(time1, format) - string2Millis(time2, format), unit); return millis2TimeSpan(string2Millis(time1, format) - string2Millis(time2, format), unit);
@ -405,8 +396,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the time span, in unit * @return the time span, in unit
*/ */
public static long getTimeSpan(final Date date1, public static long getTimeSpan(final Date date1, final Date date2,
final Date date2,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return millis2TimeSpan(date2Millis(date1) - date2Millis(date2), unit); return millis2TimeSpan(date2Millis(date1) - date2Millis(date2), unit);
} }
@ -426,8 +416,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the time span, in unit * @return the time span, in unit
*/ */
public static long getTimeSpan(final long millis1, public static long getTimeSpan(final long millis1, final long millis2,
final long millis2,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return millis2TimeSpan(millis1 - millis2, unit); return millis2TimeSpan(millis1 - millis2, unit);
} }
@ -449,10 +438,10 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the fit time span * @return the fit time span
*/ */
public static String getFitTimeSpan(final String time1, public static String getFitTimeSpan(final String time1, final String time2,
final String time2,
final int precision) { final int precision) {
long delta = string2Millis(time1, getDefaultFormat()) - string2Millis(time2, getDefaultFormat()); long delta = string2Millis(time1, getDefaultFormat()) - string2Millis(time2,
getDefaultFormat());
return millis2FitTimeSpan(delta, precision); return millis2FitTimeSpan(delta, precision);
} }
@ -473,10 +462,8 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the fit time span * @return the fit time span
*/ */
public static String getFitTimeSpan(final String time1, public static String getFitTimeSpan(final String time1, final String time2,
final String time2, @NonNull final DateFormat format, final int precision) {
@NonNull final DateFormat format,
final int precision) {
long delta = string2Millis(time1, format) - string2Millis(time2, format); long delta = string2Millis(time1, format) - string2Millis(time2, format);
return millis2FitTimeSpan(delta, precision); return millis2FitTimeSpan(delta, precision);
} }
@ -497,8 +484,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the fit time span * @return the fit time span
*/ */
public static String getFitTimeSpan(final Date date1, final Date date2, public static String getFitTimeSpan(final Date date1, final Date date2, final int precision) {
final int precision) {
return millis2FitTimeSpan(date2Millis(date1) - date2Millis(date2), precision); return millis2FitTimeSpan(date2Millis(date1) - date2Millis(date2), precision);
} }
@ -518,8 +504,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the fit time span * @return the fit time span
*/ */
public static String getFitTimeSpan(final long millis1, public static String getFitTimeSpan(final long millis1, final long millis2,
final long millis2,
final int precision) { final int precision) {
return millis2FitTimeSpan(millis1 - millis2, precision); return millis2FitTimeSpan(millis1 - millis2, precision);
} }
@ -601,8 +586,7 @@ public final class TimeUtils {
// //
// } // }
public static boolean belongCalendar(Date nowTime, Date beginTime, public static boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
Date endTime) {
Calendar date = Calendar.getInstance(); Calendar date = Calendar.getInstance();
date.setTime(nowTime); date.setTime(nowTime);
Calendar begin = Calendar.getInstance(); Calendar begin = Calendar.getInstance();
@ -724,8 +708,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the time span by now, in unit * @return the time span by now, in unit
*/ */
public static long getTimeSpanByNow(final String time, public static long getTimeSpanByNow(final String time, @NonNull final DateFormat format,
@NonNull final DateFormat format,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return getTimeSpan(time, getNowString(format), format, unit); return getTimeSpan(time, getNowString(format), format, unit);
} }
@ -802,8 +785,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the fit time span by now * @return the fit time span by now
*/ */
public static String getFitTimeSpanByNow(final String time, public static String getFitTimeSpanByNow(final String time, @NonNull final DateFormat format,
@NonNull final DateFormat format,
final int precision) { final int precision) {
return getFitTimeSpan(time, getNowString(format), format, precision); return getFitTimeSpan(time, getNowString(format), format, precision);
} }
@ -908,10 +890,8 @@ public final class TimeUtils {
Date a = sdf.parse(time1); Date a = sdf.parse(time1);
Date b = sdf.parse(time2); Date b = sdf.parse(time2);
//Date类的一个方法，如果a早于b返回true，否则返回false //Date类的一个方法，如果a早于b返回true，否则返回false
if (a.before(b)) if (a.before(b)) return true;
return true; else return false;
else
return false;
} catch (Exception e) { } catch (Exception e) {
LogUtils.e(e.getMessage()); LogUtils.e(e.getMessage());
e.printStackTrace(); e.printStackTrace();
@ -1002,8 +982,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the milliseconds differ time span * @return the milliseconds differ time span
*/ */
public static long getMillis(final long millis, public static long getMillis(final long millis, final long timeSpan,
final long timeSpan,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return millis + timeSpan2Millis(timeSpan, unit); return millis + timeSpan2Millis(timeSpan, unit);
} }
@ -1024,8 +1003,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the milliseconds differ time span * @return the milliseconds differ time span
*/ */
public static long getMillis(final String time, public static long getMillis(final String time, final long timeSpan,
final long timeSpan,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return getMillis(time, getDefaultFormat(), timeSpan, unit); return getMillis(time, getDefaultFormat(), timeSpan, unit);
} }
@ -1046,10 +1024,8 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the milliseconds differ time span. * @return the milliseconds differ time span.
*/ */
public static long getMillis(final String time, public static long getMillis(final String time, @NonNull final DateFormat format,
@NonNull final DateFormat format, final long timeSpan, @TimeConstants.Unit final int unit) {
final long timeSpan,
@TimeConstants.Unit final int unit) {
return string2Millis(time, format) + timeSpan2Millis(timeSpan, unit); return string2Millis(time, format) + timeSpan2Millis(timeSpan, unit);
} }
@ -1068,8 +1044,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the milliseconds differ time span. * @return the milliseconds differ time span.
*/ */
public static long getMillis(final Date date, public static long getMillis(final Date date, final long timeSpan,
final long timeSpan,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return date2Millis(date) + timeSpan2Millis(timeSpan, unit); return date2Millis(date) + timeSpan2Millis(timeSpan, unit);
} }
@ -1090,8 +1065,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the formatted time string differ time span * @return the formatted time string differ time span
*/ */
public static String getString(final long millis, public static String getString(final long millis, final long timeSpan,
final long timeSpan,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return getString(millis, getDefaultFormat(), timeSpan, unit); return getString(millis, getDefaultFormat(), timeSpan, unit);
} }
@ -1112,10 +1086,8 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the formatted time string differ time span * @return the formatted time string differ time span
*/ */
public static String getString(final long millis, public static String getString(final long millis, @NonNull final DateFormat format,
@NonNull final DateFormat format, final long timeSpan, @TimeConstants.Unit final int unit) {
final long timeSpan,
@TimeConstants.Unit final int unit) {
return millis2String(millis + timeSpan2Millis(timeSpan, unit), format); return millis2String(millis + timeSpan2Millis(timeSpan, unit), format);
} }
@ -1135,8 +1107,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the formatted time string differ time span * @return the formatted time string differ time span
*/ */
public static String getString(final String time, public static String getString(final String time, final long timeSpan,
final long timeSpan,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return getString(time, getDefaultFormat(), timeSpan, unit); return getString(time, getDefaultFormat(), timeSpan, unit);
} }
@ -1157,10 +1128,8 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the formatted time string differ time span * @return the formatted time string differ time span
*/ */
public static String getString(final String time, public static String getString(final String time, @NonNull final DateFormat format,
@NonNull final DateFormat format, final long timeSpan, @TimeConstants.Unit final int unit) {
final long timeSpan,
@TimeConstants.Unit final int unit) {
return millis2String(string2Millis(time, format) + timeSpan2Millis(timeSpan, unit), format); return millis2String(string2Millis(time, format) + timeSpan2Millis(timeSpan, unit), format);
} }
@ -1180,8 +1149,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the formatted time string differ time span * @return the formatted time string differ time span
*/ */
public static String getString(final Date date, public static String getString(final Date date, final long timeSpan,
final long timeSpan,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return getString(date, getDefaultFormat(), timeSpan, unit); return getString(date, getDefaultFormat(), timeSpan, unit);
} }
@ -1202,10 +1170,8 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the formatted time string differ time span * @return the formatted time string differ time span
*/ */
public static String getString(final Date date, public static String getString(final Date date, @NonNull final DateFormat format,
@NonNull final DateFormat format, final long timeSpan, @TimeConstants.Unit final int unit) {
final long timeSpan,
@TimeConstants.Unit final int unit) {
return millis2String(date2Millis(date) + timeSpan2Millis(timeSpan, unit), format); return millis2String(date2Millis(date) + timeSpan2Millis(timeSpan, unit), format);
} }
@ -1224,8 +1190,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the date differ time span * @return the date differ time span
*/ */
public static Date getDate(final long millis, public static Date getDate(final long millis, final long timeSpan,
final long timeSpan,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return millis2Date(millis + timeSpan2Millis(timeSpan, unit)); return millis2Date(millis + timeSpan2Millis(timeSpan, unit));
} }
@ -1246,8 +1211,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the date differ time span * @return the date differ time span
*/ */
public static Date getDate(final String time, public static Date getDate(final String time, final long timeSpan,
final long timeSpan,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return getDate(time, getDefaultFormat(), timeSpan, unit); return getDate(time, getDefaultFormat(), timeSpan, unit);
} }
@ -1268,10 +1232,8 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the date differ time span * @return the date differ time span
*/ */
public static Date getDate(final String time, public static Date getDate(final String time, @NonNull final DateFormat format,
@NonNull final DateFormat format, final long timeSpan, @TimeConstants.Unit final int unit) {
final long timeSpan,
@TimeConstants.Unit final int unit) {
return millis2Date(string2Millis(time, format) + timeSpan2Millis(timeSpan, unit)); return millis2Date(string2Millis(time, format) + timeSpan2Millis(timeSpan, unit));
} }
@ -1290,8 +1252,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the date differ time span * @return the date differ time span
*/ */
public static Date getDate(final Date date, public static Date getDate(final Date date, final long timeSpan,
final long timeSpan,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return millis2Date(date2Millis(date) + timeSpan2Millis(timeSpan, unit)); return millis2Date(date2Millis(date) + timeSpan2Millis(timeSpan, unit));
} }
@ -1329,8 +1290,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the formatted time string differ time span by now * @return the formatted time string differ time span by now
*/ */
public static String getStringByNow(final long timeSpan, public static String getStringByNow(final long timeSpan, @TimeConstants.Unit final int unit) {
@TimeConstants.Unit final int unit) {
return getStringByNow(timeSpan, getDefaultFormat(), unit); return getStringByNow(timeSpan, getDefaultFormat(), unit);
} }
@ -1349,8 +1309,7 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the formatted time string differ time span by now * @return the formatted time string differ time span by now
*/ */
public static String getStringByNow(final long timeSpan, public static String getStringByNow(final long timeSpan, @NonNull final DateFormat format,
@NonNull final DateFormat format,
@TimeConstants.Unit final int unit) { @TimeConstants.Unit final int unit) {
return getString(getNowMills(), format, timeSpan, unit); return getString(getNowMills(), format, timeSpan, unit);
} }
@ -1509,8 +1468,7 @@ public final class TimeUtils {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.setTime(date); cal.setTime(date);
int w = cal.get(Calendar.DAY_OF_WEEK) - 1; int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
if (w < 0) if (w < 0) w = 0;
w = 0;
return weekDays[w]; return weekDays[w];
} }
@ -1600,9 +1558,8 @@ public final class TimeUtils {
* </ul> * </ul>
* @return the value of the given calendar field * @return the value of the given calendar field
*/ */
public static int getValueByCalendarField(final String time, public static int getValueByCalendarField(final String time, @NonNull final DateFormat format
@NonNull final DateFormat format, , final int field) {
final int field) {
return getValueByCalendarField(string2Date(time, format), field); return getValueByCalendarField(string2Date(time, format), field);
} }
@ -1646,8 +1603,8 @@ public final class TimeUtils {
return cal.get(field); return cal.get(field);
} }
private static final String[] CHINESE_ZODIAC = private static final String[] CHINESE_ZODIAC = {"猴", "鸡", "狗", "猪", "鼠", "牛", "虎", "兔", "龙",
{"猴", "鸡", "狗", "猪", "鼠", "牛", "虎", "兔", "龙", "蛇", "马", "羊"}; "蛇", "马", "羊"};
/** /**
* Return the Chinese zodiac. * Return the Chinese zodiac.
@ -1704,10 +1661,8 @@ public final class TimeUtils {
} }
private static final int[] ZODIAC_FLAGS = {20, 19, 21, 21, 21, 22, 23, 23, 23, 24, 23, 22}; private static final int[] ZODIAC_FLAGS = {20, 19, 21, 21, 21, 22, 23, 23, 23, 24, 23, 22};
private static final String[] ZODIAC = { private static final String[] ZODIAC = {"水瓶座", "双鱼座", "白羊座", "金牛座", "双子座", "巨蟹座", "狮子座",
"水瓶座", "双鱼座", "白羊座", "金牛座", "双子座", "巨蟹座", "处女座", "天秤座", "天蝎座", "射手座", "魔羯座"};
"狮子座", "处女座", "天秤座", "天蝎座", "射手座", "魔羯座"
};
/** /**
* Return the zodiac. * Return the zodiac.
@ -1763,13 +1718,10 @@ public final class TimeUtils {
* @return the zodiac * @return the zodiac
*/ */
public static String getZodiac(final int month, final int day) { public static String getZodiac(final int month, final int day) {
return ZODIAC[day >= ZODIAC_FLAGS[month - 1] return ZODIAC[day >= ZODIAC_FLAGS[month - 1] ? month - 1 : (month + 10) % 12];
? month - 1
: (month + 10) % 12];
} }
private static long timeSpan2Millis(final long timeSpan, private static long timeSpan2Millis(final long timeSpan, @TimeConstants.Unit final int unit) {
@TimeConstants.Unit final int unit) {
return timeSpan * unit; return timeSpan * unit;
} }

5
modulemap/src/test/java/com/tengshisoft/modulemap/ExampleUnitTest.java
View File

@ -1,9 +1,12 @@
package com.tengshisoft.modulemap; package com.tengshisoft.modulemap;
import org.junit.Test;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import org.junit.Test;
/** /**
* Example local unit test, which will execute on the development machine (host). * Example local unit test, which will execute on the development machine (host).
* *